From 743b978c446e524ec29ee2d87b1d8a40b5d11bbf Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 4 Jun 2017 15:52:29 +0630 Subject: [PATCH 001/128] update --- app/views/settings/menu_item_instances/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb index c0170245..7d326c95 100644 --- a/app/views/settings/menu_item_instances/_form.html.erb +++ b/app/views/settings/menu_item_instances/_form.html.erb @@ -1,5 +1,5 @@ -<%= simple_form_for([:settings,:menu_item, @settings_menu_item_instance]) do |f| %> +<%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %> <%= f.error_notification %> From e6cef8ef937ab82830ad8283b75e83b0083b95ac Mon Sep 17 00:00:00 2001 From: Phyo Date: Sun, 18 Jun 2017 11:57:14 +0630 Subject: [PATCH 002/128] Redeem amount not cut bug Fix --- app/models/sale_payment.rb | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 731fa321..465a8e5b 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -187,17 +187,17 @@ class SalePayment < ApplicationRecord payment_status = false #Next time - validate if the vochure number is valid - within - 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! 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) @@ -251,7 +251,12 @@ class SalePayment < ApplicationRecord payparcost = payparcost + pp.payment_amount end end - total_amount = food_prices - payparcost + 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") @@ -266,7 +271,7 @@ class SalePayment < ApplicationRecord 'Content-Type' => 'application/json', 'Accept' => 'application/json' }) - + puts "haha" puts response.to_json end end From 3a1fba2c6f2f1a3fb96e5e130c5513b3aec622c0 Mon Sep 17 00:00:00 2001 From: Phyo Date: Sun, 18 Jun 2017 13:18:23 +0630 Subject: [PATCH 003/128] Other Payments Bug fix --- app/views/origami/jcb/index.html.erb | 8 +++++++- app/views/origami/master/index.html.erb | 8 +++++++- app/views/origami/mpu/index.html.erb | 8 +++++++- app/views/origami/visa/index.html.erb | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index 6d08b25a..9c239931 100644 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -96,6 +96,12 @@ \ No newline at end of file diff --git a/app/views/reports/daily_sale/index.html.erb b/app/views/reports/daily_sale/index.html.erb new file mode 100644 index 00000000..4aa0c841 --- /dev/null +++ b/app/views/reports/daily_sale/index.html.erb @@ -0,0 +1,190 @@ +
+
    +
  • Home
    • +
  • Daily Sale Report
    • +
+
+ +
+ <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_daily_sale_index_path} %> +
+
+ +
+
+
+ Export to Excel +
+
+
+ +
+
+
+ + + <% if params[:from]%> + + + + <% end %> + + + + + + + + + + + + + + + + + + + <% unless @sale_data.empty? %> + + + <% void = 0 %> + <% mpu = 0 %> + <% master = 0 %> + <% visa = 0 %> + <% jcb = 0 %> + <% paypar = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% grand_total = 0 %> + <% count = 1 %> <% rounding_adj = 0 %> + <% @sale_data.each do |sale| %> + <% void += sale[:void_amount] %> + <% mpu += sale[:mpu_amount] %> + <% master += sale[:master_amount] %> + <% visa += sale[:visa_amount] %> + <% jcb += sale[:jcb_amount] %> + <% paypar += sale[:paypar_amount] %> + <% cash += sale[:cash_amount] %> + <% credit += sale[:credit_amount] %> + <% foc += sale[:foc_amount] %> + <% discount += sale[:total_discount] %> + <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> + <% grand_total += sale[:grand_total].to_f %> + <% rounding_adj += sale[:rounding_adj].to_f %> + + + + + + + + + + + + + + + + + + <% count = count + 1 %> + <% end %> + + + + + + + + + + + + + + + + + + <% total_tax = 0 %> + <% unless @tax.empty? %> + <% @tax.each do |tax| %> + <% total_tax += tax.tax_amount.to_f %> + + + + + + + <% end %> + <% net = total - total_tax %> + + + + + + <% end %> + + <% end %> +
Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
Sr.noDateDaily Void AmountDaily mpu SalesDaily master SalesDaily visa SalesDaily jcb SalesDaily paypar SalesDaily Cash SalesDaily Credit SalesDaily FOC Sales(Daily Discount)Grand Total +
Rounding Adj.		Rounding Adj.Grand Total
<%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
<%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
+
+
+
+ + + \ No newline at end of file diff --git a/app/views/reports/daily_sale/index.xls.erb b/app/views/reports/daily_sale/index.xls.erb new file mode 100644 index 00000000..dfcc18d4 --- /dev/null +++ b/app/views/reports/daily_sale/index.xls.erb @@ -0,0 +1,116 @@ +
+
+ + + <% if params[:from]%> + + + + <% end %> + + + + + + + + + + + + + + + + + + + <% unless @sale_data.empty? %> + + + <% void = 0 %> + <% mpu = 0 %> + <% master = 0 %> + <% visa = 0 %> + <% jcb = 0 %> + <% paypar = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% grand_total = 0 %> + <% count = 1 %> <% rounding_adj = 0 %> + <% @sale_data.each do |sale| %> + <% void += sale[:void_amount] %> + <% mpu += sale[:mpu_amount] %> + <% master += sale[:master_amount] %> + <% visa += sale[:visa_amount] %> + <% jcb += sale[:jcb_amount] %> + <% paypar += sale[:paypar_amount] %> + <% cash += sale[:cash_amount] %> + <% credit += sale[:credit_amount] %> + <% foc += sale[:foc_amount] %> + <% discount += sale[:total_discount] %> + <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> + <% grand_total += sale[:grand_total].to_f %> + <% rounding_adj += sale[:rounding_adj].to_f %> + + + + + + + + + + + + + + + + + + <% count = count + 1 %> + <% end %> + + + + + + + + + + + + + + + + + + <% total_tax = 0 %> + <% unless @tax.empty? %> + <% @tax.each do |tax| %> + <% total_tax += tax.tax_amount.to_f %> + + + + + + + <% end %> + <% net = total - total_tax %> + + + + + + <% end %> + + <% end %> +
Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
Sr.noDateDaily Void AmountDaily mpu SalesDaily master SalesDaily visa SalesDaily jcb SalesDaily paypar SalesDaily Cash SalesDaily Credit SalesDaily FOC Sales(Daily Discount)Grand Total +
Rounding Adj.		Rounding Adj.Grand Total
<%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
<%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
+
+
\ 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 index e69de29b..786951f5 100644 --- a/app/views/reports/daily_sale_report.html.erb +++ b/app/views/reports/daily_sale_report.html.erb @@ -0,0 +1,20 @@ +
+
    +
  • 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 +
+
+
diff --git a/config/routes.rb b/config/routes.rb index b5f944b5..22a042bd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -210,6 +210,7 @@ Rails.application.routes.draw do #--------- Reports Controller Sections ------------# namespace :reports do resources :receipt_no, :only => [:index, :show] + resources :daily_sale, :only => [:index, :show] # resources :sales, :only => [:index, :show] # resources :orders, :only => [:index, :show] # resources :customers, :only => [:index, :show] From b65d127fd0463c266cca2dc01852104229f3eb59 Mon Sep 17 00:00:00 2001 From: Yan Date: Sun, 18 Jun 2017 20:07:28 +0630 Subject: [PATCH 006/128] bill print format and tax fix --- app/assets/javascripts/origami.js | 39 ++++++++++++++------------- app/models/order.rb | 4 +-- app/models/sale.rb | 12 ++++++--- app/pdf/receipt_bill_pdf.rb | 37 ++++++++++++++----------- app/views/origami/home/index.html.erb | 6 ++--- 5 files changed, 56 insertions(+), 42 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 78a21c3b..d4071432 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -55,7 +55,7 @@ $(document).ready(function(){ var cashier=""; var receipt_date=""; - var sub_total=0; + var sub_total=0.0; var discount_amount=0; var tax_amount=0; var grand_total_amount=0; @@ -69,11 +69,11 @@ $(document).ready(function(){ type: "POST", url: "/origami/" + unique_id, data: { 'booking_id' : unique_id }, - success:function(result){ + 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 = ""; + var show_date = ""; // Receipt Header receipt_no = result[i].receipt_no; @@ -81,36 +81,37 @@ $(document).ready(function(){ 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); + sub_total += parseFloat(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); + grand_total_amount = parse_data.grand_total_amount; // Ordered Items var order_items_rows = "" + "" + parse_data.item_name + "" + "" + parse_data.qty + "" + - "" + parse_data.qty*parse_data.price + "" + + "" + parse_data.price + "" + ""; $("#order-items-table").children("tbody").append(order_items_rows); } + + // Cashier Info + $("#receipt_no").text(receipt_no); + $("#cashier").text(cashier == null ? "" : cashier); + $("#receipt_date").text(show_date); + + // Payment Info + $("#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); } }); // End AJAX Call diff --git a/app/models/order.rb b/app/models/order.rb index 14fd8cda..a4328d76 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -231,7 +231,7 @@ class Order < ApplicationRecord .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,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id") + .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 @@ -262,7 +262,7 @@ class Order < ApplicationRecord .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,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id") + .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 diff --git a/app/models/sale.rb b/app/models/sale.rb index 3714c21e..ccd2a96a 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -23,8 +23,7 @@ class Sale < ApplicationRecord if (booking) Rails.logger.debug "Booking -> Booking Order Count -> " + booking.booking_orders.count.to_s #get all order attached to this booking and combine into 1 invoice - - puts booking.booking_orders.length + booking.booking_orders.each do |order| if booking.sale_id status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by) @@ -90,6 +89,8 @@ class Sale < ApplicationRecord order.save booking.sale_id = self.id + booking.checkout_at = Time.now.utc + booking.checkout_by = requested_by.name booking.save return true, self.id @@ -190,9 +191,14 @@ class Sale < ApplicationRecord # Tax Calculate def apply_tax(total_taxable) + #if tax is not apply create new record + # self.sale_taxes.each do |existing_tax| + # #delete existing and create new + # existing_tax.delete + # end #if tax is not apply create new record - self.sale_taxes.each do |existing_tax| + SaleTax.where("sale_id='#{self.sale_id}'").find_each do |existing_tax| #delete existing and create new existing_tax.delete end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 6cacc391..c1ba4936 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -4,9 +4,9 @@ class ReceiptBillPdf < Prawn::Document self.page_width = 210 self.page_height = 2500 self.margin = 5 - self.price_width = 35 + self.price_width = 40 self.qty_width = 20 - self.total_width = 35 + self.total_width = 40 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 @@ -53,29 +53,36 @@ class ReceiptBillPdf < Prawn::Document # move_down 2 y_position = cursor bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do - text "Receipt No:", :size => self.item_font_size,:align => :left + text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left end - - bounding_box([self.label_width, y_position], :width =>self.item_width) do - text "#{sale_data.receipt_no}" , :size => self.item_font_size, :align => :left + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do - text "Customer:", :size => self.item_font_size,:align => :left + bounding_box([0, y_position], :width =>self.item_width) do + text "Waiter: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left end - bounding_box([self.label_width,y_position], :width =>self.item_width) do - text "#{customer_name}" , :size => self.item_font_size,:align => :left + move_down 5 + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_width, :height => self.item_height) do + text "Cashier: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :left end move_down 5 + # 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.label_width, :height => self.item_height) do - text "Date:", :size => self.item_font_size,:align => :left + text "Time In: #{ sale_data.bookings[0].checkin_at.strftime('%I:%M %p') }", :size => self.item_font_size,:align => :left end - 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 + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "Time Out: #{ sale_data.bookings[0].checkout_at.strftime('%I:%M %p') }" , :size => self.item_font_size,:align => :right end move_down 5 @@ -118,7 +125,7 @@ class ReceiptBillPdf < Prawn::Document 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 "#{product_name}", :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 =>[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}", :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 @@ -163,7 +170,7 @@ class ReceiptBillPdf < Prawn::Document text "( " +"#{sale_data.total_discount}" +" )" , :size => self.item_font_size,:align => :right end - if sale_data.sale_taxes.length > 1 + if sale_data.sale_taxes.length > 0 sale_data.sale_taxes.each do |st| move_down 5 y_position = cursor diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index ff83dad4..ce2b3a94 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -306,12 +306,12 @@ 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) + sub_total = sub_total + sale_item.price %> <%= sale_item.product_name %> <%= sale_item.qty %> - <%= sale_item.qty*sale_item.price %> + <%= sale_item.price %> <% end @@ -322,7 +322,7 @@ # 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) + sub_total = sub_total + (order_item.qty*order_item.price) %> <%= order_item.item_name %> From faa6beb2436dae9a0b0c190298a54fd41d91bbb0 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 18 Jun 2017 20:23:39 +0630 Subject: [PATCH 007/128] update sale report --- .../_shift_sale_report_filter.html.erb | 62 ------------------- 1 file changed, 62 deletions(-) diff --git a/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb b/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb index 815cf24c..04e548da 100644 --- a/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb @@ -145,68 +145,6 @@ $(function(){ // 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(); - } - } -}); \ No newline at end of file From 675d83c80fff58933c8d42c3c2d542cd1fb689e5 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 19 Jun 2017 11:54:34 +0630 Subject: [PATCH 008/128] sale item report and rebate balance --- app/assets/javascripts/application.js | 7 + app/assets/javascripts/origami.js | 2 +- app/controllers/crm/customers_controller.rb | 10 +- .../reports/daily_sale_controller.rb | 12 -- .../reports/sale_item_controller.rb | 14 ++ app/models/sale.rb | 42 ++++++ app/pdf/receipt_bill_pdf.rb | 47 +++--- app/views/origami/home/index.html.erb | 2 +- .../_shift_sale_report_filter.html.erb | 1 + app/views/reports/daily_sale/index.html.erb | 20 +-- app/views/reports/daily_sale/index.xls.erb | 20 +-- app/views/reports/daily_sale_report.html.erb | 20 --- .../_shift_sale_report_filter.html.erb | 73 ++------- app/views/reports/sale_item/index.html.erb | 141 ++++++++++++++++++ app/views/reports/sale_item/index.xls.erb | 116 ++++++++++++++ config/routes.rb | 1 + 16 files changed, 391 insertions(+), 137 deletions(-) create mode 100644 app/controllers/reports/sale_item_controller.rb delete mode 100644 app/views/reports/daily_sale_report.html.erb rename app/views/reports/{ => sale_item}/_shift_sale_report_filter.html.erb (77%) create mode 100644 app/views/reports/sale_item/index.html.erb create mode 100644 app/views/reports/sale_item/index.xls.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 202d4387..8604d3c8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,6 +25,13 @@ $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $('.dropdown-toggle').dropdown(); }); +function export_to(path) +{ + var form_params = $("#frm_report").serialize(); + alert(form_params); + window.location = path+"?"+ form_params; +} + /* * ToDo Move to here from pages * diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 78a21c3b..88bd919d 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -49,7 +49,7 @@ $(document).ready(function(){ control_button(order_status); var customer_id=$(this).find(".customer-id").text(); - show_customer_details(customer_id); + //show_customer_details(customer_id); $("#re-print").val(unique_id); diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 290f6ca1..d83d434f 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -95,6 +95,7 @@ class Crm::CustomersController < BaseCrmController auth_token = memberaction.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + begin 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, @@ -103,6 +104,9 @@ class Crm::CustomersController < BaseCrmController 'Accept' => 'application/json' } ) + rescue Net::OpenTimeout + response = { status: false } + end if response["status"] == true @@ -159,7 +163,7 @@ end 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 - + begin 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, @@ -168,7 +172,9 @@ end 'Accept' => 'application/json' } ) - + rescue Net::OpenTimeout + response = { status: false } + end format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' } format.json { render :show, status: :ok, location: @crm_customer } diff --git a/app/controllers/reports/daily_sale_controller.rb b/app/controllers/reports/daily_sale_controller.rb index 86e60702..34a3b5e2 100644 --- a/app/controllers/reports/daily_sale_controller.rb +++ b/app/controllers/reports/daily_sale_controller.rb @@ -5,19 +5,7 @@ class Reports::DailySaleController < BaseReportController @sale_data = Sale.daily_sales_list(from,to) @tax = SaleTax.get_tax(from,to) end - - # @locations = Location.all - # branch,from, to, report_type = get_date_range_from_params - - # @location = Location.find_by_id(current_location) - # @sale_data = Sale.daily_sales_report(current_location,from,to) - # @tax = SaleT.get_tax(current_location,from,to) - - # if @sale_data.blank? && @tax.blank? && request.post? - # flash.now[:notice] = "No data available for selected filters" - # end - def show end diff --git a/app/controllers/reports/sale_item_controller.rb b/app/controllers/reports/sale_item_controller.rb new file mode 100644 index 00000000..40aea618 --- /dev/null +++ b/app/controllers/reports/sale_item_controller.rb @@ -0,0 +1,14 @@ +class Reports::SaleItemController < BaseReportController + + def index + + from, to, report_type = get_date_range_from_params + + @sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type) + end + + def show + + end + +end \ No newline at end of file diff --git a/app/models/sale.rb b/app/models/sale.rb index 999577d7..5e0691f4 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -16,6 +16,14 @@ class Sale < ApplicationRecord scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } + REPORT_TYPE = { + "daily" => 0, + "monthly" => 1, + "yearly" => 2 + } + + SALE_STATUS_COMPLETED = "completed" + def generate_invoice_from_booking(booking_id, requested_by) booking = Booking.find(booking_id) status = false @@ -328,6 +336,40 @@ class Sale < ApplicationRecord return daily_total end +def self.get_by_range_by_saleitems(from,to,status,report_type) + + query = Sale.select(" + mi.item_code as code,(SUM(i.qty) * i.unit_price) as grand_total, + SUM(i.qty) as total_item," + + " i.unit_price as unit_price, + mi.name as product_name, + mc.name as menu_category_name, + mc.id as menu_category_id ") + .group('mi.id') + .order("mi.menu_category_id") + + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id + JOIN menu_items mi ON i.product_code = mi.item_code" + + " JOIN menu_categories mc ON mc.id = mi.menu_category_id + JOIN employees ea ON ea.id = sales.cashier_id") + + + query = query.where("receipt_date between ? and ? and sale_status=?",from,to,status) + + + + case report_type.to_i + when REPORT_TYPE["daily"] + return query + when REPORT_TYPE["monthly"] + + return query.group("MONTH(date)") + when REPORT_TYPE["yearly"] + return query.group("YEAR(date)") + end + +end + private def generate_custom_id diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 6cacc391..dfecfdf0 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -33,7 +33,7 @@ class ReceiptBillPdf < Prawn::Document all_total(sale_data) if member_info != nil - member_info(member_info) + member_info(member_info,customer_name) end footer end @@ -61,14 +61,14 @@ class ReceiptBillPdf < Prawn::Document end move_down 5 - y_position = cursor - 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.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.label_width, :height => self.item_height) do + # text "Customer:", :size => self.item_font_size,:align => :left + # end + # 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.label_width, :height => self.item_height) do @@ -203,19 +203,32 @@ class ReceiptBillPdf < Prawn::Document end # show member information - def member_info(member_info) + def member_info(member_info,customer_name) move_down 7 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Customer", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ customer_name }" , :size => self.item_font_size,:align => :right + end + move_down 5 + 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 + if res["accountable_type"]== "RebateAccount" + + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Rebate Balance", :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 diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index ff83dad4..6b7b0c20 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -364,7 +364,7 @@ <%=@selected_item.grand_total rescue 0%> --> - + diff --git a/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb b/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb index 04e548da..3a5d788c 100644 --- a/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/daily_sale/_shift_sale_report_filter.html.erb @@ -147,4 +147,5 @@ $(function(){ }); + \ No newline at end of file diff --git a/app/views/reports/daily_sale/index.html.erb b/app/views/reports/daily_sale/index.html.erb index 4aa0c841..a2403045 100644 --- a/app/views/reports/daily_sale/index.html.erb +++ b/app/views/reports/daily_sale/index.html.erb @@ -32,16 +32,16 @@ Sr.no Date - Daily Void Amount - Daily mpu Sales - Daily master Sales - Daily visa Sales - Daily jcb Sales - Daily paypar Sales - Daily Cash Sales - Daily Credit Sales - Daily FOC Sales - (Daily Discount) + Void Amount + Mpu Sales + Master Sales + Visa Sales + Jcb Sales + Paypar Sales + Cash Sales + Credit Sales + FOC Sales + (Discount) Grand Total +
Rounding Adj. Rounding Adj. Grand Total diff --git a/app/views/reports/daily_sale/index.xls.erb b/app/views/reports/daily_sale/index.xls.erb index dfcc18d4..67e76e3c 100644 --- a/app/views/reports/daily_sale/index.xls.erb +++ b/app/views/reports/daily_sale/index.xls.erb @@ -10,16 +10,16 @@ Sr.no Date - Daily Void Amount - Daily mpu Sales - Daily master Sales - Daily visa Sales - Daily jcb Sales - Daily paypar Sales - Daily Cash Sales - Daily Credit Sales - Daily FOC Sales - (Daily Discount) + Void Amount + Mpu Sales + Master Sales + Visa Sales + Jcb Sales + Paypar Sales + Cash Sales + Credit Sales + FOC Sales + (Discount) Grand Total +
Rounding Adj. Rounding Adj. Grand Total diff --git a/app/views/reports/daily_sale_report.html.erb b/app/views/reports/daily_sale_report.html.erb deleted file mode 100644 index 786951f5..00000000 --- a/app/views/reports/daily_sale_report.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -
-
    -
  • 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 -
-
-
diff --git a/app/views/reports/_shift_sale_report_filter.html.erb b/app/views/reports/sale_item/_shift_sale_report_filter.html.erb similarity index 77% rename from app/views/reports/_shift_sale_report_filter.html.erb rename to app/views/reports/sale_item/_shift_sale_report_filter.html.erb index 1b4082f5..7f95b6b9 100644 --- a/app/views/reports/_shift_sale_report_filter.html.erb +++ b/app/views/reports/sale_item/_shift_sale_report_filter.html.erb @@ -18,7 +18,8 @@ -
+ +
@@ -143,69 +144,13 @@ $(function(){ $('#frm_report').submit(); // window.location = url; }); + + function export_to(path) +{ + var form_params = $("#frm_report").serialize(); + window.location = path+"?"+ form_params; +} - 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(); - } - } -}); \ No newline at end of file diff --git a/app/views/reports/sale_item/index.html.erb b/app/views/reports/sale_item/index.html.erb new file mode 100644 index 00000000..cce5a210 --- /dev/null +++ b/app/views/reports/sale_item/index.html.erb @@ -0,0 +1,141 @@ +
+
    +
  • Home
    • +
  • Daily Sale Report
    • +
+
+ +
+ <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_sale_item_index_path} %> +
+
+ +
+
+
+ Export to Excel +
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + +
Date
Menu CategoryCodeProductTotal ItemUnit PriceRevenue
+
+
+
+ + \ No newline at end of file diff --git a/app/views/reports/sale_item/index.xls.erb b/app/views/reports/sale_item/index.xls.erb new file mode 100644 index 00000000..dfcc18d4 --- /dev/null +++ b/app/views/reports/sale_item/index.xls.erb @@ -0,0 +1,116 @@ +
+
+ + + <% if params[:from]%> + + + + <% end %> + + + + + + + + + + + + + + + + + + + <% unless @sale_data.empty? %> + + + <% void = 0 %> + <% mpu = 0 %> + <% master = 0 %> + <% visa = 0 %> + <% jcb = 0 %> + <% paypar = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% grand_total = 0 %> + <% count = 1 %> <% rounding_adj = 0 %> + <% @sale_data.each do |sale| %> + <% void += sale[:void_amount] %> + <% mpu += sale[:mpu_amount] %> + <% master += sale[:master_amount] %> + <% visa += sale[:visa_amount] %> + <% jcb += sale[:jcb_amount] %> + <% paypar += sale[:paypar_amount] %> + <% cash += sale[:cash_amount] %> + <% credit += sale[:credit_amount] %> + <% foc += sale[:foc_amount] %> + <% discount += sale[:total_discount] %> + <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> + <% grand_total += sale[:grand_total].to_f %> + <% rounding_adj += sale[:rounding_adj].to_f %> + + + + + + + + + + + + + + + + + + <% count = count + 1 %> + <% end %> + + + + + + + + + + + + + + + + + + <% total_tax = 0 %> + <% unless @tax.empty? %> + <% @tax.each do |tax| %> + <% total_tax += tax.tax_amount.to_f %> + + + + + + + <% end %> + <% net = total - total_tax %> + + + + + + <% end %> + + <% end %> +
Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
Sr.noDateDaily Void AmountDaily mpu SalesDaily master SalesDaily visa SalesDaily jcb SalesDaily paypar SalesDaily Cash SalesDaily Credit SalesDaily FOC Sales(Daily Discount)Grand Total +
Rounding Adj.		Rounding Adj.Grand Total
<%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
<%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
+
+
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6253a95f..7bb463ee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -212,6 +212,7 @@ Rails.application.routes.draw do namespace :reports do resources :receipt_no, :only => [:index, :show] resources :daily_sale, :only => [:index, :show] + resources :sale_item, :only => [:index, :show] # resources :sales, :only => [:index, :show] # resources :orders, :only => [:index, :show] # resources :customers, :only => [:index, :show] From dd3c429301389f684d9413e46e0ee7092a198683 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 19 Jun 2017 11:56:26 +0630 Subject: [PATCH 009/128] control paypar url and oqs fix --- app/models/order_queue_station.rb | 4 ++- app/models/sale_payment.rb | 50 +++++++++++++++++-------------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 0350049c..2df76af8 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -29,7 +29,9 @@ class OrderQueueStation < ApplicationRecord if oqs.id == oqpbz.order_queue_station_id #Same Order_items can appear in two location. AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - end + else + AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + end end end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 3b67648c..856cd054 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -66,19 +66,20 @@ class SalePayment < ApplicationRecord end - def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid,auth_token) - begin - response = HTTParty.get(url, - :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, - :headers => { - 'Content-Type' => 'application/json', - 'Accept' => 'application/json' - }, :timeout => 10 - ) - rescue Net::OpenTimeout - response = { status: false } - end - return response; + def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid,auth_token) + # Control for Paypar Cloud + begin + response = HTTParty.get(url, + :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }, :timeout => 10 + ) + rescue Net::OpenTimeout + response = { status: false } + end + return response; end def self.redeem(paypar_url,token,membership_id,received_amount,sale_id) @@ -90,13 +91,19 @@ class SalePayment < ApplicationRecord 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' - } - ) + # Control for Paypar Cloud + begin + 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' + }, + :timeout => 10 + ) + rescue Net::OpenTimeout + response = false + end else response = false; end @@ -122,7 +129,6 @@ class SalePayment < ApplicationRecord end def creditnote_payment(customer_id) - payment_status = false self.payment_method = "creditnote" @@ -190,7 +196,6 @@ class SalePayment < ApplicationRecord 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) @@ -269,6 +274,7 @@ class SalePayment < ApplicationRecord auth_token = memberaction.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + # Control for Paypar Cloud begin 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, From b826b479cdd05aea3493f56005dac2398d77d212 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 19 Jun 2017 12:07:43 +0630 Subject: [PATCH 010/128] update for oqs print --- app/models/printer/order_queue_printer.rb | 16 ++++++++-------- app/pdf/order_item_pdf.rb | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index dae1ad53..f0b3d576 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -6,12 +6,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #Print order_item= print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) pdf = OrderItemPdf.new(order_item[0]) - pdf.render_file "tmp/receipt.pdf" + pdf.render_file "tmp/order_item.pdf" if oqs.print_copy - self.print("tmp/receipt.pdf", oqs.printer_name) - self.print("tmp/receipt.pdf", oqs.printer_name) + self.print("tmp/order_item.pdf", oqs.printer_name) + self.print("tmp/order_item.pdf", oqs.printer_name) else - self.print("tmp/receipt.pdf", oqs.printer_name) + self.print("tmp/order_item.pdf", oqs.printer_name) end end @@ -24,12 +24,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker if oqs.cut_per_item order.each do|odi| pdf = OrderItemPdf.new(odi) - pdf.render_file "tmp/receipt.pdf" + pdf.render_file "tmp/order_item.pdf" if oqs.print_copy - self.print("tmp/receipt.pdf", oqs.printer_name) - self.print("tmp/receipt.pdf", oqs.printer_name) + self.print("tmp/order_item.pdf", oqs.printer_name) + self.print("tmp/order_item.pdf", oqs.printer_name) else - self.print("tmp/receipt.pdf", oqs.printer_name) + self.print("tmp/order_item.pdf", oqs.printer_name) end end # For Print Order Summary diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 96008dfd..dd223e49 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -71,7 +71,7 @@ class OrderItemPdf < Prawn::Document add_order_items(order_item) dash(1, :space => 1, :phase => 1) - stroke_horizontal_line 0, self.page_width + stroke_horizontal_line 0, (self.page_width - self.margin) move_down 5 end From 33128d26a21e7c82ade0aa72a06dcb4b6f595fd0 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 19 Jun 2017 12:17:08 +0630 Subject: [PATCH 011/128] add Back Button in Redeem --- app/views/origami/redeem_payments/index.html.erb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 0991e562..3d7607c4 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -41,7 +41,7 @@

You can rebate upto <%= @food_prices %>

-->
-
+
@@ -84,9 +84,15 @@
Pay
+
+ +
+
+ +
From 2dbbb17634beec5ff77f5e155440199a260971af Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 19 Jun 2017 12:21:54 +0630 Subject: [PATCH 012/128] Add extra fields to accounts --- .../settings/accounts_controller.rb | 2 +- app/views/layouts/_header.html.erb | 2 ++ app/views/settings/accounts/_form.html.erb | 7 +++++-- app/views/settings/accounts/index.html.erb | 19 ++++++++++++++----- app/views/settings/accounts/show.html.erb | 12 ++++++++++-- db/migrate/20170331024747_create_accounts.rb | 4 ++++ 6 files changed, 36 insertions(+), 10 deletions(-) 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/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index a385806c..c729f255 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -23,6 +23,8 @@
  • <%= 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" %>
    • 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/db/migrate/20170331024747_create_accounts.rb b/db/migrate/20170331024747_create_accounts.rb index 5816aace..4c4a7b74 100644 --- a/db/migrate/20170331024747_create_accounts.rb +++ b/db/migrate/20170331024747_create_accounts.rb @@ -3,6 +3,10 @@ class CreateAccounts < ActiveRecord::Migration[5.1] 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 From fcd159086818c784e0cf4aeea27f962fb5b5fce4 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 19 Jun 2017 15:51:04 +0630 Subject: [PATCH 013/128] change query --- app/assets/stylesheets/origami.scss | 4 ++++ app/models/order.rb | 4 ++-- app/views/origami/payments/show.html.erb | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 71a9915e..c96237fa 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -95,6 +95,10 @@ background-color:#7a62d3; } +.orange{ + background-color:#FF7F50; +} + .red { background-color:#ff0000; } diff --git a/app/models/order.rb b/app/models/order.rb index f3ae798c..9c65304b 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -231,7 +231,7 @@ class Order < ApplicationRecord .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") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_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 @@ -262,7 +262,7 @@ class Order < ApplicationRecord .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") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_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 diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 995e13e9..91d5b6b2 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -235,9 +235,10 @@
    - - - + + + +
    From d8930cb2b5c7812595fb03fd0564984b2f6846b4 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 19 Jun 2017 15:55:21 +0630 Subject: [PATCH 014/128] still --- app/models/order_queue_station.rb | 38 +++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 2df76af8..f086e3cd 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -31,24 +31,52 @@ class OrderQueueStation < ApplicationRecord AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) else AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - end + end + puts oqs.station_name + puts oqs.auto_print + puts oqs.cut_per_item + puts oqs.print_copy + if oqs.auto_print + print_slip(oqs, order, order_items) + end end end end end #Print OQS where printing is require - end private #Print order_items in 1 slip - def print_slip + def print_slip(oqs, order, items) + unique_code="OrderSummaryPdf" + + # 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(oqs,order.order_id) + # update print status for completed same order items + items.each do |ai| + ai.print_status=true + ai.save + end end - #Print order_items in 1 slip per item - def print_slip_item + #Print order_item in 1 slip per item + def print_slip_item(oqs, item) + unique_code="OrderItemPdf" + # 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(oqs,item.order_id, item.item_code ) + + # update print status for completed same order items + item.each do |ai| + ai.print_status=true + ai.save + end end end From 35fc649df34757ce15d8436b465bf056aa1dde16 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 19 Jun 2017 15:56:45 +0630 Subject: [PATCH 015/128] pg order --- app/models/order.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index 14fd8cda..96382c07 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -246,7 +246,7 @@ class Order < ApplicationRecord .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") + .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 From d78327f90678f0967564a0905af98d4eebd290c5 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 19 Jun 2017 16:22:39 +0630 Subject: [PATCH 016/128] Membership Setting UI --- .../membership_actions/_form.html.erb | 1 - .../membership_actions/index.html.erb | 80 ++++++++++--------- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb index 3084d4ac..ac3e07b0 100644 --- a/app/views/settings/membership_actions/_form.html.erb +++ b/app/views/settings/membership_actions/_form.html.erb @@ -9,7 +9,6 @@ <%= f.input :auth_token %> <%= f.input :merchant_account_id %> <%= f.input :created_by %> - <%= f.input :additional_parameter %>
    diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb index 635fd34c..4a348ed3 100644 --- a/app/views/settings/membership_actions/index.html.erb +++ b/app/views/settings/membership_actions/index.html.erb @@ -1,41 +1,47 @@ -

    <%= 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?' } %>
    +
    +
      +
    • Home
      • +
    • Settings Membership Actions
      • + + <%= link_to 'New Settings Membership Action', new_settings_membership_action_path,:class => 'btn btn-primary btn-sm' %> + +
    +

    +
    + + + + + + + + + + + + + + -<%= link_to 'New Settings Membership Action', new_settings_membership_action_path %> + + <% @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?' } %>
    +
    From c02e305c309ea309fad25f1faf2ee0283b37e9d0 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 19 Jun 2017 16:24:44 +0630 Subject: [PATCH 017/128] Zone Created_at Bug Fix --- app/controllers/settings/rooms_controller.rb | 10 ++++++---- app/controllers/settings/tables_controller.rb | 9 +++++---- app/controllers/settings/zones_controller.rb | 5 ++++- app/views/settings/rooms/_form.html.erb | 1 - app/views/settings/tables/_form.html.erb | 1 - app/views/settings/zones/_form.html.erb | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/controllers/settings/rooms_controller.rb b/app/controllers/settings/rooms_controller.rb index 69e3ec22..2d5b01e1 100644 --- a/app/controllers/settings/rooms_controller.rb +++ b/app/controllers/settings/rooms_controller.rb @@ -1,6 +1,6 @@ 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] + before_action :set_settings_zone, only: [:index, :show, :edit, :new, :update,:create,:destroy] # GET /settings/rooms # GET /settings/rooms.json def index @@ -28,9 +28,10 @@ class Settings::RoomsController < ApplicationController @settings_room = Room.new(settings_room_params) @settings_room.type = DiningFacility::ROOM_TYPE @settings_room.zone_id = params[:zone_id] + @settings_room.created_by = current_login_employee.name respond_to do |format| if @settings_room.save - format.html { redirect_to settings_zone_rooms_path, notice: 'Room was successfully created.' } + format.html { redirect_to settings_zone_path(@zone), notice: 'Room was successfully created.' } format.json { render :show, status: :created, location: @settings_room } else puts "abc" @@ -43,9 +44,10 @@ class Settings::RoomsController < ApplicationController # PATCH/PUT /settings/rooms/1 # PATCH/PUT /settings/rooms/1.json def update + @settings_room.created_by = current_login_employee.name 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.html { redirect_to settings_zone_path(@zone), notice: 'Room was successfully updated.' } format.json { render :show, status: :ok, location: @settings_room } else format.html { render :edit } @@ -59,7 +61,7 @@ class Settings::RoomsController < ApplicationController def destroy @settings_room.destroy respond_to do |format| - format.html { redirect_to settings_zones_path, notice: 'Room was successfully destroyed.' } + format.html { redirect_to settings_zone_path(@zone), notice: 'Room was successfully destroyed.' } format.json { head :no_content } end end diff --git a/app/controllers/settings/tables_controller.rb b/app/controllers/settings/tables_controller.rb index 124a0d94..7c293455 100644 --- a/app/controllers/settings/tables_controller.rb +++ b/app/controllers/settings/tables_controller.rb @@ -28,12 +28,12 @@ class Settings::TablesController < ApplicationController @settings_table = Table.new(settings_table_params) @settings_table.type = DiningFacility::TABLE_TYPE @settings_table.zone_id = params[:zone_id] + @settings_table.created_by = current_login_employee.name respond_to do |format| if @settings_table.save - format.html { redirect_to settings_zone_tables_path, notice: 'Table was successfully created.' } + format.html { redirect_to settings_zone_path(@zone), 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 @@ -43,9 +43,10 @@ class Settings::TablesController < ApplicationController # PATCH/PUT /settings/tables/1 # PATCH/PUT /settings/tables/1.json def update + @settings_table.created_by = current_login_employee.name 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.html { redirect_to settings_zone_path(@zone), notice: 'Table was successfully updated.' } format.json { render :show, status: :ok, location: @settings_table } else format.html { render :edit } @@ -59,7 +60,7 @@ class Settings::TablesController < ApplicationController def destroy @settings_table.destroy respond_to do |format| - format.html { redirect_to settings_zones_path, notice: 'Table was successfully destroyed.' } + format.html { redirect_to settings_zone_path(@zone), notice: 'Table was successfully destroyed.' } format.json { head :no_content } end end diff --git a/app/controllers/settings/zones_controller.rb b/app/controllers/settings/zones_controller.rb index 5752b5e3..08a6f189 100644 --- a/app/controllers/settings/zones_controller.rb +++ b/app/controllers/settings/zones_controller.rb @@ -27,7 +27,7 @@ class Settings::ZonesController < ApplicationController # POST /settings/zones.json def create @settings_zone = Zone.new(settings_zone_params) - + @settings_zone.created_by = current_login_employee.name respond_to do |format| if @settings_zone.save format.html { redirect_to settings_zone_path(@settings_zone), notice: 'Zone was successfully created.' } @@ -43,6 +43,7 @@ class Settings::ZonesController < ApplicationController # PATCH/PUT /settings/zones/1.json def update respond_to do |format| + @settings_zone.created_by = current_login_employee.name if @settings_zone.update(settings_zone_params) format.html { redirect_to settings_zone_path(@settings_zone), notice: 'Zone was successfully updated.' } format.json { render :show, status: :ok, location: @settings_zone } @@ -56,6 +57,8 @@ class Settings::ZonesController < ApplicationController # DELETE /settings/zones/1 # DELETE /settings/zones/1.json def destroy + @settings_zone.rooms.destroy + @settings_zone.tables.destroy @settings_zone.destroy respond_to do |format| format.html { redirect_to settings_zones_path, notice: 'Zone was successfully destroyed.' } diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb index c164ab67..25af618c 100644 --- a/app/views/settings/rooms/_form.html.erb +++ b/app/views/settings/rooms/_form.html.erb @@ -7,7 +7,6 @@ <%= f.input :seater %> <%= f.input :order_by %> <%= f.input :is_active %> - <%= f.input :created_by, :collection => Employee.collection %>
    diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb index a411175c..169e1601 100644 --- a/app/views/settings/tables/_form.html.erb +++ b/app/views/settings/tables/_form.html.erb @@ -7,7 +7,6 @@ <%= f.input :seater %> <%= f.input :order_by %> <%= f.input :is_active %> - <%= f.input :created_by, :collection => Employee.collection %>
    diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb index a7740211..351f2c94 100644 --- a/app/views/settings/zones/_form.html.erb +++ b/app/views/settings/zones/_form.html.erb @@ -4,7 +4,7 @@
    <%= f.input :name %> <%= f.input :is_active %> - <%= f.input :created_by, :collection => Employee.collection %> +
    From 9089eab19617643954de06fc38151adfacc4cc95 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 19 Jun 2017 17:36:39 +0630 Subject: [PATCH 018/128] temp remove options in oqs --- app/controllers/oqs/home_controller.rb | 4 +-- app/models/order_queue_station.rb | 32 ++++++++++------------- app/models/printer/order_queue_printer.rb | 17 ++++++++---- app/pdf/order_summary_pdf.rb | 5 ++-- app/views/oqs/home/index.html.erb | 10 +++++-- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 58aac67c..14d79857 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -2,9 +2,9 @@ class Oqs::HomeController < BaseOqsController def index queue_stations=OrderQueueStation.all - @queue_items_details = queue_items_query(0) + @queue_items_details = queue_items_query(false) - @queue_completed_item = queue_items_query(1) + @queue_completed_item = queue_items_query(true) @queue_stations_items=Array.new diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index f086e3cd..a5267442 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -16,6 +16,7 @@ class OrderQueueStation < ApplicationRecord oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id) order_items = order.order_items + #Assign OQS id to order Items oqs_stations.each do |oqs| #Get List of items - @@ -26,16 +27,13 @@ class OrderQueueStation < ApplicationRecord #Processing through the looping items order_items.each do |order_item| if (pq_item == order_item.item_code) - if oqs.id == oqpbz.order_queue_station_id - #Same Order_items can appear in two location. + # if oqs.id == oqpbz.order_queue_station_id + # #Same Order_items can appear in two location. + # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + # else AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - else - AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - end - puts oqs.station_name - puts oqs.auto_print - puts oqs.cut_per_item - puts oqs.print_copy + # end + if oqs.auto_print print_slip(oqs, order, order_items) end @@ -43,29 +41,27 @@ class OrderQueueStation < ApplicationRecord end end end - - #Print OQS where printing is require end private #Print order_items in 1 slip - def print_slip(oqs, order, items) + def print_slip(oqs, order, order_items) unique_code="OrderSummaryPdf" - # 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(oqs,order.order_id) - # update print status for completed same order items - items.each do |ai| + AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai| + # update print status for order items ai.print_status=true ai.save - end + end + end #Print order_item in 1 slip per item - def print_slip_item(oqs, item) + def print_slip_item(oqs, assigned_order_item) unique_code="OrderItemPdf" # print when complete click @@ -74,7 +70,7 @@ class OrderQueueStation < ApplicationRecord order_queue_printer.print_order_item(oqs,item.order_id, item.item_code ) # update print status for completed same order items - item.each do |ai| + assigned_order_item.each do |ai| ai.print_status=true ai.save end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index f0b3d576..52fc3244 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -23,13 +23,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Per Item if oqs.cut_per_item order.each do|odi| + filename = "tmp/order_item_#{odi.item_name}" + ".pdf" pdf = OrderItemPdf.new(odi) - pdf.render_file "tmp/order_item.pdf" + # pdf.render_file "tmp/order_item.pdf" + pdf.render_file filename if oqs.print_copy - self.print("tmp/order_item.pdf", oqs.printer_name) - self.print("tmp/order_item.pdf", oqs.printer_name) + self.print(filename, oqs.printer_name) + self.print(filename.gsub(".","-copy."), oqs.printer_name) else - self.print("tmp/order_item.pdf", oqs.printer_name) + self.print(filename, oqs.printer_name) end end # For Print Order Summary @@ -37,7 +39,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker filename = "tmp/order_summary_#{order_id}" + ".pdf" pdf = OrderSummaryPdf.new(order) pdf.render_file filename - self.print(filename, oqs.printer_name) + if oqs.print_copy + self.print(filename, oqs.printer_name) + self.print(filename.gsub(".","-copy."), oqs.printer_name) + else + self.print(filename, oqs.printer_name) + end end end diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 47c1f6a5..22f27497 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -77,6 +77,7 @@ class OrderSummaryPdf < Prawn::Document move_down 5 order_item.each do|odi| + y_position = cursor 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 @@ -84,9 +85,9 @@ class OrderSummaryPdf < Prawn::Document 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 + move_down 5 + end end end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 18e72880..084ae8cf 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -49,7 +49,10 @@ <%= qid.qty %> ] -

    Medium, Fries, Salad

    +

    Order at @@ -97,7 +100,10 @@ <%= qid.qty %> ] -

    Medium, Fries, Salad

    +

    Order at From 90be2b8d63ab578e870760bec0e888dbd0695625 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 19 Jun 2017 18:54:19 +0630 Subject: [PATCH 019/128] OQS edit bug fix --- app/assets/javascripts/settings/processing_items.js | 2 +- app/controllers/settings/order_queue_stations_controller.rb | 2 +- app/views/settings/order_queue_stations/_form.html.erb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/settings/processing_items.js b/app/assets/javascripts/settings/processing_items.js index 445b46d5..60c53ba4 100644 --- a/app/assets/javascripts/settings/processing_items.js +++ b/app/assets/javascripts/settings/processing_items.js @@ -40,7 +40,7 @@ $(document).on('turbolinks:load', function() { items.push($(value).attr("data-id")); }); - $("#order_queue_station_processing_items").val(items); + $("#order_queue_station_processing_items").val(JSON.stringify(items)); //$(this).submit(); }) }) diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index b63e1ca8..bc7766a7 100644 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -41,7 +41,7 @@ class Settings::OrderQueueStationsController < ApplicationController # PATCH/PUT /settings/order_queue_stations/1 # PATCH/PUT /settings/order_queue_stations/1.json def update - params[:order_queue_station][:processing_items] = params[:order_queue_station][:processing_items].split(/,/).inspect + # params[:order_queue_station][:processing_items] = params[:order_queue_station][:processing_items].split(/,/).inspect respond_to do |format| if @settings_order_queue_station.update(settings_order_queue_station_params) format.html { redirect_to settings_order_queue_station_path(@settings_order_queue_station), notice: 'Order queue station was successfully updated.' } diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 7a2cba43..67b34798 100644 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -13,6 +13,7 @@ div.form-inputs span{ <%= f.input :printer_name %> <%= f.input :font_size %> <%= f.input :print_copy %> + <%= f.hidden_field :processing_items %> <%= f.label "Select Zones", :class => 'control-label' %> <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'ta'%> <%= f.input :cut_per_item %> From c95b0130dc9e94a8e8ac416b0fc58d8717474ede Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 19 Jun 2017 18:56:36 +0630 Subject: [PATCH 020/128] edit migrate oqs --- db/migrate/20170403151731_create_order_queue_stations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20170403151731_create_order_queue_stations.rb b/db/migrate/20170403151731_create_order_queue_stations.rb index 6c327b8e..801cdef0 100644 --- a/db/migrate/20170403151731_create_order_queue_stations.rb +++ b/db/migrate/20170403151731_create_order_queue_stations.rb @@ -3,7 +3,7 @@ class CreateOrderQueueStations < ActiveRecord::Migration[5.1] create_table :order_queue_stations do |t| t.string :station_name, :null => false t.boolean :is_active, :null => false, :default => false - t.json :processing_items + t.json :processing_items, :default => "[]" t.boolean :print_copy, :null => false, :default => false t.string :printer_name t.integer :font_size, :null => false, :default => 10 From a71ee3657ab5a1af8f4bffa33dc0f60466341da6 Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 20 Jun 2017 07:36:38 +0630 Subject: [PATCH 021/128] origami changes --- app/assets/javascripts/origami.js | 345 +------------ app/assets/javascripts/origami_bk.js | 352 +++++++++++++ app/assets/stylesheets/origami.scss | 7 + app/controllers/oqs/home_controller.rb | 28 +- app/controllers/origami/home_controller.rb | 100 +--- app/controllers/origami/home_controller_bk.rb | 84 ++++ app/models/booking.rb | 2 + app/models/dining_facility.rb | 11 +- app/models/order.rb | 4 +- app/models/room.rb | 1 + app/models/table.rb | 2 +- app/models/table_booking.rb | 2 +- app/views/layouts/origami.html.erb | 4 +- app/views/origami/home/index.html.erb | 464 ++++-------------- app/views/origami/home/index_bk.html.erb | 388 +++++++++++++++ app/views/origami/home/show.html.erb | 217 ++++++++ config/initializers/assets.rb | 2 +- config/routes.rb | 3 +- 18 files changed, 1199 insertions(+), 817 deletions(-) create mode 100644 app/assets/javascripts/origami_bk.js create mode 100644 app/controllers/origami/home_controller_bk.rb create mode 100644 app/views/origami/home/index_bk.html.erb create mode 100644 app/views/origami/home/show.html.erb diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index d4071432..47a4dace 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -1,15 +1,3 @@ -// 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 @@ -20,333 +8,8 @@ //= 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.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 Charges - sub_total += parseFloat(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; - - // Ordered Items - var order_items_rows = "" + - "" + parse_data.item_name + "" + - "" + parse_data.qty + "" + - "" + parse_data.price + "" + - ""; - - $("#order-items-table").children("tbody").append(order_items_rows); - } - - // Cashier Info - $("#receipt_no").text(receipt_no); - $("#cashier").text(cashier == null ? "" : cashier); - $("#receipt_date").text(show_date); - - // Payment Info - $("#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); - } - }); - // 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().substr(0,16); - 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().substr(0,16); - - 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').substr(0,16); - 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().substr(0,16); - 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().substr(0,16); - 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().substr(0,16); - - 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); - if (data["response_data"]["data"].length) { - $.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); - } - - } - }); - }else{ - $('.rebate_amount').addClass('hide'); - } - } - }); - //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'); - }); - + $(".orders").on('click', function(){ + var dining_id = $(this).attr("data-id"); + window.location.href = '/origami/' + dining_id; + }) }); - -/* 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_bk.js b/app/assets/javascripts/origami_bk.js new file mode 100644 index 00000000..d4071432 --- /dev/null +++ b/app/assets/javascripts/origami_bk.js @@ -0,0 +1,352 @@ +// 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.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 Charges + sub_total += parseFloat(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; + + // Ordered Items + var order_items_rows = "" + + "" + parse_data.item_name + "" + + "" + parse_data.qty + "" + + "" + parse_data.price + "" + + ""; + + $("#order-items-table").children("tbody").append(order_items_rows); + } + + // Cashier Info + $("#receipt_no").text(receipt_no); + $("#cashier").text(cashier == null ? "" : cashier); + $("#receipt_date").text(show_date); + + // Payment Info + $("#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); + } + }); + // 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().substr(0,16); + 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().substr(0,16); + + 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').substr(0,16); + 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().substr(0,16); + 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().substr(0,16); + 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().substr(0,16); + + 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); + if (data["response_data"]["data"].length) { + $.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); + } + + } + }); + }else{ + $('.rebate_amount').addClass('hide'); + } + } + }); + //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/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 71a9915e..f4ef30ac 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -89,6 +89,13 @@ text-align: right; } +.display-none{ + display: none; +} + +.text-white{ + color: #fff; +} /* Colors */ .purple { diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 58aac67c..b4d564f2 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -2,9 +2,9 @@ class Oqs::HomeController < BaseOqsController def index queue_stations=OrderQueueStation.all - @queue_items_details = queue_items_query(0) + @queue_items_details = queue_items_query(false) - @queue_completed_item = queue_items_query(1) + @queue_completed_item = queue_items_query(true) @queue_stations_items=Array.new @@ -30,14 +30,14 @@ class Oqs::HomeController < BaseOqsController dining = DiningFacility.find_by_name(table_name); # oqpz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id) # if status == "" - # AssignedOrderItem.where("order_queue_station_id=#{ oqpz.order_queue_station_id } AND delivery_status=0").find_each do |aoi| - # oi = OrderItem.find_by_item_code(aoi.item_code) - # items.push(oi) + # AssignedOrderItem.where("order_queue_station_id=#{ oqpz.order_queue_station_id } AND delivery_status=0").find_each do |aoi| + # oi = OrderItem.find_by_item_code(aoi.item_code) + # items.push(oi) # end # else - # AssignedOrderItem.where("order_queue_station_id=#{ oqpz.order_queue_station_id } AND delivery_status=1").find_each do |aoi| - # oi = OrderItem.find_by_item_code(aoi.item_code) - # items.push(oi) + # AssignedOrderItem.where("order_queue_station_id=#{ oqpz.order_queue_station_id } AND delivery_status=1").find_each do |aoi| + # oi = OrderItem.find_by_item_code(aoi.item_code) + # items.push(oi) # end # end @@ -49,7 +49,7 @@ class Oqs::HomeController < BaseOqsController end end - # booking_id = dining.get_new_booking + # booking_id = dining.get_new_booking # BookingOrder.where("booking_id='#{ booking_id }'").find_each do |bo| # order=Order.find(bo.order_id); # order.order_items.each do |oi| @@ -81,6 +81,8 @@ class Oqs::HomeController < BaseOqsController # Query for OQS with status def queue_items_query(status) + puts status + puts "put what is status" # 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 @@ -88,9 +90,9 @@ class Oqs::HomeController < BaseOqsController # 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.customer_id = od.customer_id") - # .where("assigned_order_items.delivery_status = #{status}") + # .where("assigned_order_items.delivery_status = #{status}") # .group("assigned_order_items.assigned_order_item_id") - # .order("odt.item_name DESC") + # .order("odt.item_name DESC") 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_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join orders as od ON od.order_id = assigned_order_items.order_id @@ -99,7 +101,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status}") - .group("assigned_order_items.assigned_order_item_id") + .where("assigned_order_items.delivery_status = #{status}") + .group("assigned_order_items.assigned_order_item_id,oqs.station_name,oqs.is_active,df.name,odt.item_code,odt.item_name,odt.price, odt.qty, odt.item_order_by,cus.name,odt.created_at") end end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 1aca9b2d..455cda09 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -1,84 +1,32 @@ class Origami::HomeController < BaseOrigamiController + before_action :set_dining, only: [:show] + def index - 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 - - @completed_orders = Order.get_completed_order() - @booking_orders = Order.get_booking_order_table() - @booking_rooms = Order.get_booking_order_rooms() - @orders = Order.get_orders() + @tables = Table.all.active.order('status desc') + @rooms = Room.all.active.order('status desc') 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 + def show + @tables = Table.all.active.order('status desc') + @rooms = Room.all.active.order('status desc') + @dining.bookings.each do |booking| + if booking.sale_id.nil? + booking_orders = booking.booking_orders + booking_orders.each do |booking_order| + @order = booking_order.order + end + @status = 'order' + else + @status = 'sale' + @obj = Sale.find(booking.sale_id) end + end end +private + +def set_dining + @dining = DiningFacility.find(params[:dining_id]) +end + end diff --git a/app/controllers/origami/home_controller_bk.rb b/app/controllers/origami/home_controller_bk.rb new file mode 100644 index 00000000..1aca9b2d --- /dev/null +++ b/app/controllers/origami/home_controller_bk.rb @@ -0,0 +1,84 @@ +class Origami::HomeController < BaseOrigamiController + def index + 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 + + @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/models/booking.rb b/app/models/booking.rb index 01cf0f46..0738df40 100644 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -1,5 +1,7 @@ class Booking < ApplicationRecord + + self.primary_key = "booking_id" #primary key - need to be unique diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 6f898989..588a7bcd 100644 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -1,6 +1,7 @@ class DiningFacility < ApplicationRecord belongs_to :zone - + has_many :bookings + TABLE_TYPE = "Table" ROOM_TYPE = "Room" @@ -9,8 +10,8 @@ class DiningFacility < ApplicationRecord scope :active, -> {where(is_active: true)} def get_current_booking - 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) + 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].booking_id @@ -21,10 +22,10 @@ class DiningFacility < ApplicationRecord def get_new_booking # query for new - # if status + # if status # to ask when req bill booking_status? booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and sale_id is null and checkout_at is null").limit(1) - # else + # else # booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and sale_id not null").limit(1) # end diff --git a/app/models/order.rb b/app/models/order.rb index 2ea76a98..96382c07 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -231,7 +231,7 @@ class Order < ApplicationRecord .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") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_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 @@ -262,7 +262,7 @@ class Order < ApplicationRecord .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") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_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 diff --git a/app/models/room.rb b/app/models/room.rb index d99708a3..263120fd 100644 --- a/app/models/room.rb +++ b/app/models/room.rb @@ -1,3 +1,4 @@ class Room < DiningFacility + # has_many :bookings, :foreign_key => 'dining_facility_id' end diff --git a/app/models/table.rb b/app/models/table.rb index 31614e12..4012a40c 100644 --- a/app/models/table.rb +++ b/app/models/table.rb @@ -1,4 +1,4 @@ class Table < DiningFacility has_many :dining_ins - + # has_many :bookings, :foreign_key => 'dining_facility_id' end diff --git a/app/models/table_booking.rb b/app/models/table_booking.rb index 4b76f158..53fde486 100644 --- a/app/models/table_booking.rb +++ b/app/models/table_booking.rb @@ -1,3 +1,3 @@ class TableBooking < Booking - + belongs_to :sale end diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb index 179d9ae1..ea2c0ce4 100644 --- a/app/views/layouts/origami.html.erb +++ b/app/views/layouts/origami.html.erb @@ -10,7 +10,7 @@ <%= csrf_meta_tags %> <%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> @@ -23,7 +23,7 @@ <%=message%>

    <% end %> - + <% end %> <%= yield %> diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index ce2b3a94..4b85d839 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -1,388 +1,104 @@ -
    - -
    +
    + +
    - - - + + + -
    - -
    -
    - <% - @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 - %> -
    -
    +
    +
    - -
    -
    - <% - @booking_orders.each do |bko| - # No Show completed - if bko.sale_status == 'completed' - next - end +
    +
    - # 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 - %> -
    -
    - - - -

    <%= bko.table_name %>

    -

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

    -

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

    -
    -
    - <% - end - %> -
    -
    + +
    +
    + <% @tables.each do |table| %> + <% if table.status == 'occupied' %> +
    +
    + <%= table.name %> +
    +
    + <% else %> +
    +
    + <%= table.name %> +
    +
    + <% end %> + <% end %> +
    +
    - -
    -
    - <% - @booking_rooms.each do |rmo| - # No Show completed - if rmo.sale_status == 'completed' - next - end + +
    +
    + <% @rooms.each do |room| %> + <% if room.status == 'occupied' %> +
    +
    + <%= room.name %> +
    +
    + <% else %> +
    +
    + <%= room.name %> +
    +
    + <% end %> + <% 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 - %> -
    -
    - - - -

    <%= rmo.room_name %>

    -

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

    -

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

    -
    -
    - <% - 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 -
    -
    -
    -
    -
    -

    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 = sub_total + sale_item.price - %> - - - - - - <% - end - end - %> - - <% - # For Order Items - if @selected_item_type == "Order" - @selected_item.order_items.each do |order_item| - sub_total = sub_total + (order_item.qty*order_item.price) - %> - - - - - - <% - end - end - %> - -
    ItemsQTY - Price -
    <%= sale_item.product_name %><%= 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%>)
    -
    -
    -
    +
    - - -
    - - - - - - - - - - - -
    -
    + +
    +
    + + diff --git a/app/views/origami/home/index_bk.html.erb b/app/views/origami/home/index_bk.html.erb new file mode 100644 index 00000000..ce2b3a94 --- /dev/null +++ b/app/views/origami/home/index_bk.html.erb @@ -0,0 +1,388 @@ +
    + +
    + + + + + +
    + +
    +
    + <% + @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 + %> +
    +
    + + +
    +
    + <% + @booking_orders.each do |bko| + # No Show completed + if bko.sale_status == 'completed' + next + end + + # 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 + %> +
    +
    + + + +

    <%= bko.table_name %>

    +

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

    +

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

    +
    +
    + <% + end + %> +
    +
    + + +
    +
    + <% + @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 + %> +
    +
    + + + +

    <%= rmo.room_name %>

    +

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

    +

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

    +
    +
    + <% + 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 -
    +
    +
    +
    +
    +

    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 = sub_total + sale_item.price + %> + + + + + + <% + end + end + %> + + <% + # For Order Items + if @selected_item_type == "Order" + @selected_item.order_items.each do |order_item| + sub_total = sub_total + (order_item.qty*order_item.price) + %> + + + + + + <% + end + end + %> + +
    ItemsQTY + Price +
    <%= sale_item.product_name %><%= 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%>)
    +
    +
    +
    +
    + + +
    + + + + + + + + + + + +
    +
    diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb new file mode 100644 index 00000000..32b3a85c --- /dev/null +++ b/app/views/origami/home/show.html.erb @@ -0,0 +1,217 @@ +
    + +
    + + + + + +
    + +
    +
    + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + <% @tables.each do |table| %> + <% if table.status == 'occupied' %> +
    +
    + <%= table.name %> +
    +
    + <% else %> +
    +
    + <%= table.name %> +
    +
    + <% end %> + <% end %> +
    +
    + + +
    +
    + <% @rooms.each do |room| %> + <% if room.status == 'occupied' %> +
    +
    + <%= room.name %> +
    +
    + <% else %> +
    +
    + <%= room.name %> +
    +
    + <% end %> + <% end %> +
    +
    + + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    + + + +
    +
    +
    +
    ORDER DETAILS
    +
    +
    +
    +
    +

    Receipt No: + <% if @status == 'sale' %> + <%= @obj.receipt_no rescue '' %> + <% end %> +

    +
    +
    +

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

    +
    +
    +
    +
    +

    Customer :

    +
    + +
    +
    + + + + + + + + <% + # For Sale Items + sub_total = 0 + if @status == "sale" + @obj.sale_items.each do |sale_item| + sub_total = sub_total + sale_item.price + %> + <% unless sale_item.price <= 0 %> + + + + + + <% + end + end + end + %> + + <% + # For Order Items + if @status == "order" + sub_total = 0 + @order.order_items.each do |order_item| + sub_total = sub_total + (order_item.qty*order_item.price) + %> + + + + + + <% + end + end + %> + +
    ItemsQTY + Price +
    <%= sale_item.product_name %><%= 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%>)
    +
    +
    +
    +
    + + +
    + + + + + + + + + + + +
    +
    + diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 9952a7bc..3a596cee 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -12,7 +12,7 @@ Rails.application.config.assets.version = '1.0' # --- Waiter/ Cashier - Orgiami ---- Rails.application.config.assets.precompile += %w( origami.css ) -Rails.application.config.assets.precompile += %w( origami.js ) +# 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 ) diff --git a/config/routes.rb b/config/routes.rb index 6253a95f..0df21efd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -72,7 +72,8 @@ Rails.application.routes.draw do #--------- Cashier ------------# namespace :origami do root "home#index" - get "/:booking_id" => "home#index" do #origami/:booking_id will show + get "/:dining_id" => "home#show" do #origami/:booking_id will show + # resources :discounts, only: [:index,:new, :create ] #add discount type resources :customers #add customer type end From bdb42daad796a751fb677c284cefb4f35043aa4f Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 20 Jun 2017 07:42:05 +0630 Subject: [PATCH 022/128] dining facility model --- app/models/booking.rb | 2 -- app/models/dining_facility.rb | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/models/booking.rb b/app/models/booking.rb index 0738df40..01cf0f46 100644 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -1,7 +1,5 @@ class Booking < ApplicationRecord - - self.primary_key = "booking_id" #primary key - need to be unique diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 588a7bcd..65c337e4 100644 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -1,7 +1,6 @@ class DiningFacility < ApplicationRecord belongs_to :zone - has_many :bookings - + TABLE_TYPE = "Table" ROOM_TYPE = "Room" From 80362f87feddabb1a2d844daf475303460967676 Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 20 Jun 2017 13:22:27 +0630 Subject: [PATCH 023/128] Rebate Option --- .../origami/redeem_payments_controller.rb | 11 ++-- app/models/sale_item.rb | 55 ++++++++++--------- app/models/sale_payment.rb | 14 ++--- .../origami/redeem_payments/index.html.erb | 6 +- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 99601449..792cb7a4 100644 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -6,7 +6,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController sale_data = Sale.find_by_sale_id(@sale_id) # limit redeem_amount - food_prices, beverage_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) + rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) + nonrebate_prices = sale_data.total_amount - rebate_prices @payparcount = 0 others = 0 sale_data.sale_payments.each do |sale_payment| @@ -16,11 +17,11 @@ class Origami::RedeemPaymentsController < BaseOrigamiController 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 + non_rebate_exceed = others - (nonrebate_prices + sale_data.total_tax) + if non_rebate_exceed < 0 + @redeem_prices = rebate_prices - @payparcount else - @food_prices = food_prices - @payparcount -is_bervage_exceed + @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed end if sale_data diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index a999b6a8..bec8b5c5 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -32,48 +32,49 @@ class SaleItem < ApplicationRecord # Calculate food total and beverage total 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 + rebateacc = Account.where("rebate=?",true) + puts "Account that can rebate" + rebateacc.each do |i| + puts i.title end - puts food_prices - puts beverage_prices - return food_prices, beverage_prices + prices=0 + sale_items.each do |si| + price = self.get_price(si.sale_item_id,rebateacc) + + prices = prices + price + end + return prices end # get food price or beverage price for item - def self.get_price(sale_item_id) - food_price=0 - beverage_price=0 + def self.get_price(sale_item_id,rebateacc) + 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 + rebateacc.each do |i| + if item[0].account_id == i.id + price = item[0].price + end end return 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") diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 715c7479..4ca22423 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -241,7 +241,9 @@ class SalePayment < ApplicationRecord end def rebat(sObj) - food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) + rebate_prices = SaleItem.calculate_food_beverage(sObj.sale_items) + puts "rebate_prices" + puts rebate_prices generic_customer_id = sObj.customer.membership_id if generic_customer_id != nil || generic_customer_id != "" || generic_customer_id != 0 paypar = sObj.sale_payments @@ -251,12 +253,10 @@ class SalePayment < ApplicationRecord 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 + # overall_dis = SaleItem.get_overall_discount(sObj.id) + overall_dis = sObj.total_discount + + total_amount = rebate_prices - payparcost + overall_dis if total_amount > 0 receipt_no = sObj.receipt_no membership = MembershipSetting.find_by_membership_type("paypar_url") diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index e1363d8b..83b24213 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -6,7 +6,7 @@
    - +
    @@ -38,7 +38,7 @@ +

    You can rebate upto <%= @redeem_prices %>

    -->
    @@ -151,7 +151,7 @@ $("#redeem").click(function(){ }else if(valid_amount< redeem_amount){ alert(" Insufficient Amount!") }else{ - if(redeem_amount <= "<%= @food_prices %>"){ + if(redeem_amount <= "<%= @redeem_prices %>"){ $.ajax({ type: "POST", url: "<%=origami_payment_paypar_path%>", From e43818fdf5101667fc01f593e11dd2c482ec533a Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 20 Jun 2017 13:33:41 +0630 Subject: [PATCH 024/128] oqs updated --- app/assets/javascripts/OQS.js | 4 ++- app/controllers/oqs/print_controller.rb | 11 +++++-- app/models/order_queue_station.rb | 3 ++ app/models/printer/order_queue_printer.rb | 22 +++++++------- app/pdf/order_item_pdf.rb | 18 ++++++------ app/pdf/order_summary_pdf.rb | 29 +++++++++++-------- ...70403151731_create_order_queue_stations.rb | 2 +- 7 files changed, 53 insertions(+), 36 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index e7b85110..87121ea3 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -122,11 +122,13 @@ $(document).ready(function(){ // Print Order Summary $('#print_order_summary').on('click',function(){ + var table_name=$('.selected-item').children().children().children('.order-zone').text().trim(); var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); - var params = { 'id':assigned_item_id }; + var params = { 'table_name':table_name }; $.ajax({ type: 'GET', url: '/oqs/print/print_order_summary/'+assigned_item_id, + data: params, success: function(data){ } }); }); diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 9fc2a2d7..dbbc8351 100644 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -8,11 +8,12 @@ class Oqs::PrintController < ApplicationController # order queue stations oqs = assigned_item.order_queue_station + print_status = assigned_item.print_status == true ? " (Re-Print)" : "" # 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(oqs,assigned_item.order_id, assigned_item.item_code ) + order_queue_printer.print_order_item(oqs, assigned_item.order_id, assigned_item.item_code, print_status ) # update print status for completed same order items assigned_items.each do |ai| @@ -25,16 +26,22 @@ class Oqs::PrintController < ApplicationController def print_order_summary unique_code="OrderSummaryPdf" assigned_item_id=params[:id] + table_name=params[:table_name] assigned_item=AssignedOrderItem.find(assigned_item_id) assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); # order queue stations oqs = assigned_item.order_queue_station + print_status = assigned_item.print_status == true ? " (Re-Print)" : "" + + # get dining + dining = DiningFacility.find_by_name(table_name); + booking = Booking.find_by_dining_facility_id(dining.id) # 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(oqs,assigned_item.order_id) + order_queue_printer.print_order_summary(oqs, booking, print_status) # update print status for completed same order items assigned_items.each do |ai| diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index a5267442..2f0b40aa 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -31,6 +31,9 @@ class OrderQueueStation < ApplicationRecord # #Same Order_items can appear in two location. # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) # else + puts pq_item + puts order_item.item_code + puts oqs.station_name AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) # end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 52fc3244..ab6794b2 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -1,11 +1,11 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker - def print_order_item(oqs,order_id, item_code) + def print_order_item(oqs,order_id, item_code, print_status) #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]) + order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) + pdf = OrderItemPdf.new(order_item[0], print_status) pdf.render_file "tmp/order_item.pdf" if oqs.print_copy self.print("tmp/order_item.pdf", oqs.printer_name) @@ -15,16 +15,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end end - def print_order_summary(oqs,order_id) + def print_order_summary(oqs,booking, print_status) #Use CUPS service #Generate PDF #Print - order=print_query('order_summary',order_id) + order=print_query('order_summary',booking.booking_id) # For Print Per Item if oqs.cut_per_item order.each do|odi| filename = "tmp/order_item_#{odi.item_name}" + ".pdf" - pdf = OrderItemPdf.new(odi) + pdf = OrderItemPdf.new(odi, print_status) # pdf.render_file "tmp/order_item.pdf" pdf.render_file filename if oqs.print_copy @@ -36,8 +36,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # For Print Order Summary else - filename = "tmp/order_summary_#{order_id}" + ".pdf" - pdf = OrderSummaryPdf.new(order) + filename = "tmp/order_summary_#{booking.booking_id}" + ".pdf" + pdf = OrderSummaryPdf.new(order, print_status) pdf.render_file filename if oqs.print_copy self.print(filename, oqs.printer_name) @@ -59,15 +59,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker left join customers as cus ON cus.customer_id = orders.customer_id") .where("order_items.item_code='" + code + "'") .group("order_items.item_code") - else + else 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.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") + .where("b.booking_id='" + code + "'") + # .group("order_items.item_code") end end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index dd223e49..e5c5395f 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -1,16 +1,16 @@ 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 + def initialize(order_item, print_status) + self.page_width = 210 + self.page_height = 2500 + self.margin = 5 self.price_width = 40 # No Need for item - self.qty_width = 34 + self.qty_width = 30 self.total_width = 40 # No Need for item - self.item_width = self.page_width - (self.qty_width + (self.margin*4)) + self.item_width = self.page_width - self.qty_width self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=80 + self.label_width=100 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]) @@ -19,9 +19,9 @@ class OrderItemPdf < Prawn::Document # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" self.header_font_size = 14 - self.item_font_size = 12 + self.item_font_size = 12 - text "#{order_item.dining}", :size => self.header_font_size,:align => :center, :left_margin => -20 + text "#{ order_item.dining+print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 stroke_horizontal_rule move_down 5 diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 22f27497..a1459512 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -1,13 +1,13 @@ 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 + def initialize(order, print_status) + self.page_width = 210 + self.page_height = 2500 + self.margin = 5 self.price_width = 40 # No Need for item - self.qty_width = 34 + self.qty_width = 30 self.total_width = 40 # No Need for item - self.item_width = self.page_width - (self.qty_width + (self.margin*4)) + self.item_width = self.page_width - (self.qty_width - self.margin) self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) self.label_width=100 @@ -20,7 +20,7 @@ class OrderSummaryPdf < Prawn::Document self.header_font_size = 12 self.item_font_size = 10 - text "#{order[0].dining}", :size => self.header_font_size,:align => :center, :left_margin => -20 + text "#{ order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 stroke_horizontal_rule move_down 5 @@ -59,7 +59,7 @@ class OrderSummaryPdf < Prawn::Document 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 + bounding_box([self.item_width-2,y_position], :width => self.qty_width, :height => self.item_height) do text "Qty", :size => self.item_font_size,:align => :left end @@ -78,12 +78,17 @@ class OrderSummaryPdf < Prawn::Document order_item.each do|odi| y_position = cursor - 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 + + # pad_top(15) { + # text_box "#{odi.item_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + # text_box "#{odi.qty}", :at =>[self.item_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + # } + bounding_box([0,y_position], :width => self.item_width) do + text "#{odi.item_name}", :size => self.item_font_size,:align => :left, :height => self.item_height 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 + bounding_box([self.item_width,y_position], :width => self.qty_width) do + text "#{odi.qty}", :size => self.item_font_size,:align => :left, :height => self.item_height end move_down 5 diff --git a/db/migrate/20170403151731_create_order_queue_stations.rb b/db/migrate/20170403151731_create_order_queue_stations.rb index 801cdef0..6c327b8e 100644 --- a/db/migrate/20170403151731_create_order_queue_stations.rb +++ b/db/migrate/20170403151731_create_order_queue_stations.rb @@ -3,7 +3,7 @@ class CreateOrderQueueStations < ActiveRecord::Migration[5.1] create_table :order_queue_stations do |t| t.string :station_name, :null => false t.boolean :is_active, :null => false, :default => false - t.json :processing_items, :default => "[]" + t.json :processing_items t.boolean :print_copy, :null => false, :default => false t.string :printer_name t.integer :font_size, :null => false, :default => 10 From 6528845d827a4f8fdf8ddc7fce185c4ccc1656c3 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 20 Jun 2017 15:58:50 +0630 Subject: [PATCH 025/128] oqs updated --- app/controllers/oqs/print_controller.rb | 8 ++- app/models/order_queue_station.rb | 13 ++-- app/models/printer/order_queue_printer.rb | 85 +++++++++++++++++++---- 3 files changed, 83 insertions(+), 23 deletions(-) diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index dbbc8351..ff2cf98d 100644 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -8,6 +8,8 @@ class Oqs::PrintController < ApplicationController # order queue stations oqs = assigned_item.order_queue_station + + # Check Printed print_status = assigned_item.print_status == true ? " (Re-Print)" : "" # print when complete click @@ -22,7 +24,7 @@ class Oqs::PrintController < ApplicationController end end - # Print Order Details + # Print Order Details with booking id def print_order_summary unique_code="OrderSummaryPdf" assigned_item_id=params[:id] @@ -32,6 +34,8 @@ class Oqs::PrintController < ApplicationController # order queue stations oqs = assigned_item.order_queue_station + + # Check Printed print_status = assigned_item.print_status == true ? " (Re-Print)" : "" # get dining @@ -41,7 +45,7 @@ class Oqs::PrintController < ApplicationController # 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(oqs, booking, print_status) + order_queue_printer.print_booking_summary(oqs, booking.booking_id, print_status) # update print status for completed same order items assigned_items.each do |ai| diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 2f0b40aa..2e85ecde 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -16,6 +16,9 @@ class OrderQueueStation < ApplicationRecord oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id) order_items = order.order_items + + # get dining + booking = Booking.find_by_dining_facility_id(dining.id) #Assign OQS id to order Items oqs_stations.each do |oqs| @@ -31,9 +34,7 @@ class OrderQueueStation < ApplicationRecord # #Same Order_items can appear in two location. # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) # else - puts pq_item - puts order_item.item_code - puts oqs.station_name + AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) # end @@ -49,11 +50,11 @@ class OrderQueueStation < ApplicationRecord private #Print order_items in 1 slip def print_slip(oqs, order, order_items) - unique_code="OrderSummaryPdf" + unique_code="OrderSummaryPdf" print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_summary(oqs,order.order_id) + order_queue_printer.print_order_summary(oqs,order.order_id, print_status="") AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai| # update print status for order items @@ -70,7 +71,7 @@ class OrderQueueStation < ApplicationRecord # 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(oqs,item.order_id, item.item_code ) + order_queue_printer.print_order_item(oqs,item.order_id, item.item_code, print_status="" ) # update print status for completed same order items assigned_order_item.each do |ai| diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index ab6794b2..63666a68 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -4,22 +4,29 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #Use CUPS service #Generate PDF #Print - order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) + order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) + + filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" pdf = OrderItemPdf.new(order_item[0], print_status) - pdf.render_file "tmp/order_item.pdf" + pdf.render_file filename + if oqs.print_copy - self.print("tmp/order_item.pdf", oqs.printer_name) - self.print("tmp/order_item.pdf", oqs.printer_name) + self.print(filename, oqs.printer_name) + + #For print copy + pdf.render_file filename.gsub(".","-copy.") + self.print(filename.gsub(".","-copy."), oqs.printer_name) else - self.print("tmp/order_item.pdf", oqs.printer_name) + self.print(filename, oqs.printer_name) end end - def print_order_summary(oqs,booking, print_status) + # Query for per order + def print_order_summary(oqs, order_id, print_status) #Use CUPS service #Generate PDF - #Print - order=print_query('order_summary',booking.booking_id) + #Print + order=print_query('order_summary', order_id) # For Print Per Item if oqs.cut_per_item order.each do|odi| @@ -36,11 +43,51 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # For Print Order Summary else - filename = "tmp/order_summary_#{booking.booking_id}" + ".pdf" + filename = "tmp/order_summary_#{ order_id }" + ".pdf" pdf = OrderSummaryPdf.new(order, print_status) pdf.render_file filename if oqs.print_copy self.print(filename, oqs.printer_name) + + #For print copy + pdf.render_file filename.gsub(".","-copy.") + self.print(filename.gsub(".","-copy."), oqs.printer_name) + else + self.print(filename, oqs.printer_name) + end + end + end + + # Print for orders in booking + def print_booking_summary(oqs, booking_id, print_status) + order=print_query('booking_summary', booking_id) + # For Print Per Item + if oqs.cut_per_item + order.each do|odi| + filename = "tmp/order_item_#{odi.item_name}" + ".pdf" + pdf = OrderItemPdf.new(odi, print_status) + pdf.render_file filename + + if oqs.print_copy + self.print(filename, oqs.printer_name) + + #For print copy + pdf.render_file filename.gsub(".","-copy.") + self.print(filename.gsub(".","-copy."), oqs.printer_name) + else + self.print(filename, oqs.printer_name) + end + end + # For Print Order Summary + else + filename = "tmp/booking_summary_#{ booking_id }" + ".pdf" + pdf = OrderSummaryPdf.new(order, print_status) + pdf.render_file filename + if oqs.print_copy + self.print(filename, oqs.printer_name) + + #For print copy + pdf.render_file filename.gsub(".","-copy.") self.print(filename.gsub(".","-copy."), oqs.printer_name) else self.print(filename, oqs.printer_name) @@ -49,25 +96,33 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # Query for OQS with status - def print_query(type, code) - if type == 'order_item' + def print_query(type, id) + if type == "order_item" 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.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("order_items.item_code='" + code + "'") + .where("order_items.item_code = '#{ id }'") .group("order_items.item_code") - else + elsif type == "order_summary" 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.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("b.booking_id='" + code + "'") - # .group("order_items.item_code") + .where("orders.order_id = '#{ id }'") + else + # order summary for booking + 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.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("b.booking_id = '#{ id }'") end end From 33cb8b64a32d25c093bf89cb44d545999adaf26f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Jun 2017 17:57:50 +0630 Subject: [PATCH 026/128] finished customer form and update --- app/assets/stylesheets/CRM.scss | 3 + app/controllers/crm/customers_controller.rb | 33 +++--- .../origami/payments_controller.rb | 5 +- app/models/customer.rb | 42 ++----- app/models/sale_payment.rb | 4 +- app/views/api/customers/index.json.jbuilder | 4 +- app/views/api/customers/show.json.jbuilder | 4 +- app/views/crm/customers/index.html.erb | 107 +++++++++++++++--- app/views/crm/customers/show.json.jbuilder | 5 +- app/views/origami/customers/index.html.erb | 93 +++++++++++++-- app/views/reports/receipt_no/index.html.erb | 9 +- app/views/transactions/sales/show.html.erb | 2 +- ....rb => 20170620091919_create_customers.rb} | 8 +- 13 files changed, 235 insertions(+), 84 deletions(-) rename db/migrate/{20170403135121_create_customers.rb => 20170620091919_create_customers.rb} (73%) diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 8ddc1605..e2b88eaa 100644 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -23,3 +23,6 @@ .assign .text-muted{ color: #fff !important; } +.required abbr{ + color: red !important; +} \ No newline at end of file diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index d83d434f..0adefbf4 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -7,23 +7,19 @@ class Crm::CustomersController < BaseCrmController filter = params[:filter] if filter.nil? - @crm_customers = Customer.order("customer_id").page(params[:page]) - #@products = Product.order("name").page(params[:page]).per(5) + @crm_customers = Customer.all else @crm_customers = Customer.search(filter) end #@crm_customers = Customer.all - @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50) + @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50) @crm_customer = Customer.new + @count_customer = Customer.count_customer # 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 } @@ -50,14 +46,14 @@ class Crm::CustomersController < BaseCrmController end #get customer amount - @customer = Customer.find(params[:id]) - response = Customer.get_member_account(@customer) + # @customer = Customer.find(params[:id]) + # response = Customer.get_member_account(@customer) - if(response["status"] == true) - @membership = response["data"] - else + # if(response["status"] == true) + # @membership = response["data"] + # else @membership = 0 - end + # end #end customer amount @@ -87,6 +83,8 @@ class Crm::CustomersController < BaseCrmController phone = customer_params[:contact_no] email = customer_params[:email] dob = customer_params[:date_of_birth] + address = customer_params[:address] + nrc = customer_params[:nrc_no] member_group_id = params[:member_group_id] membership = MembershipSetting.find_by_membership_type("paypar_url") @@ -97,7 +95,7 @@ class Crm::CustomersController < BaseCrmController begin response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, - dob: dob, + dob: dob,address: address,nrc:nrc, member_group_id: member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, :headers => { 'Content-Type' => 'application/json', @@ -155,6 +153,8 @@ end phone = customer_params[:contact_no] email = customer_params[:email] dob = customer_params[:date_of_birth] + address = customer_params[:address] + nrc = customer_params[:nrc_no] id = @crm_customer.membership_id member_group_id = params[:member_group_id] @@ -165,7 +165,7 @@ end url = membership.gateway_url.to_s + memberaction.gateway_url.to_s begin response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, - dob: dob, + dob: dob,address: address,nrc:nrc, id: id,member_group_id:member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json, :headers => { 'Content-Type' => 'application/json', @@ -207,6 +207,7 @@ end # Never trust parameters from the scary internet, only allow the white list through. def customer_params - params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth) + params.require(:customer).permit(:name, :company, :contact_no, :email, + :date_of_birth,:salution,:gender,:nrc_no,:address,:card_no) end end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index e8ce6a96..6a6f4ca6 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -10,10 +10,9 @@ class Origami::PaymentsController < BaseOrigamiController if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) sale_payment = SalePayment.new - rebate_amount = sale_payment.process_payment(saleObj, @user, cash, "cash") + sale_payment.process_payment(saleObj, @user, cash, "cash") - puts "resssssssssssssssssss" - puts rebate_amount.to_json + rebate_amount = nil unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) diff --git a/app/models/customer.rb b/app/models/customer.rb index de9846f2..0924d232 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -45,43 +45,19 @@ class Customer < ApplicationRecord end end -# require "net/http" -# def self.url_exist?(url_string) -# url = URI.parse(url_string) - - -# req = Net::HTTP.new(url.host, url.port) -# puts "hhhhhhhhhhhh" -# puts req.to_json -# req.use_ssl = (url.scheme == 'https') -# puts "aaaaaaaaaaaa" -# puts req.use_ssl? -# path = url.path if url.path.present? -# puts "bbbbbbbbbbbbb" -# puts path -# res = req.request_head(path || '/') -# puts "cccccccccccccc" -# puts res.to_json -# puts "ddddddddd" -# puts res.kind_of?(Net::HTTPRedirection) -# if res.kind_of?(Net::HTTPRedirection) -# url_exist?(res['location']) # Go after any redirect and make sure you can access the redirected URL -# else -# ! %W(4 5).include?(res.code[0]) # Not from 4xx or 5xx families -# end -# rescue Errno::ENOENT -# false #false if can't find the server -# 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 + def self.count_customer + all = self.all.count+1 + count = all-2 + + end + + WALKIN = "CUS-000000000001" + TAKEAWAY = "CUS-000000000002" + private def generate_custom_id self.customer_id = SeedGenerator.generate_id(self.class.name, "CUS") diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 92bebd59..c31ed341 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -54,10 +54,8 @@ class SalePayment < ApplicationRecord #record an payment in sale-audit 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) - sObj = Sale.find(self.sale_id) - response = rebat(sObj) - return true, response + return true, self.save else #record an payment in sale-audit remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]" diff --git a/app/views/api/customers/index.json.jbuilder b/app/views/api/customers/index.json.jbuilder index 900e6c6b..2c3c07a7 100644 --- a/app/views/api/customers/index.json.jbuilder +++ b/app/views/api/customers/index.json.jbuilder @@ -1 +1,3 @@ -json.array! @customers, :id, :name, :company, :contact_no, :email, :membership_id, :membership_type +json.array! @customers, :id, :name, :company, :contact_no,:salution, + :gender,:nrc_no,:address,:card_no, :membership_type, + :membership_id, :created_at diff --git a/app/views/api/customers/show.json.jbuilder b/app/views/api/customers/show.json.jbuilder index 79397308..db56961b 100644 --- a/app/views/api/customers/show.json.jbuilder +++ b/app/views/api/customers/show.json.jbuilder @@ -1,4 +1,6 @@ -json.extract! @customer, :id, :name, :company, :contact_no, :membership_type, :membership_id, :created_at +json.extract! @customer, :id, :name, :company, :contact_no,:salution, + :gender,:nrc_no,:address,:card_no, :membership_type, + :membership_id, :created_at json.invoices do json.array! @customer.lastest_invoices ,:id, :receipt_no, :receipt_date, :sale_status, :payment_status end diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index f97de091..532857f9 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -34,6 +34,7 @@ Select + Sr.no Name Company Contact no @@ -43,11 +44,13 @@ <% if @crm_customers.count > 0 %> + <% @i = 0 %> <% @crm_customers.each do |crm_customer| %> <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <%= @i += 1 %> <%= crm_customer.name %> <%= crm_customer.company rescue '-' %> <%= crm_customer.contact_no %> @@ -75,32 +78,89 @@ <%= f.hidden_field :id, :class => "form-control col-md-6 " %> + +
    +
    + + + + +
    "> - <%= f.input :name, :class => "form-control col-md-6 name" %> + <%= f.input :name, :class => "form-control col-md-6 name", :required => true %> + <% flash.each do |name, msg| %> - <%= msg['name'] %> + <% str="[\"#{msg['name']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> <% end -%> -
    +
    - <%= f.input :company, :class => "form-control col-md-6 company" %> +
    + + +
    + +
    + <%= f.input :nrc_no, :class => "form-control nrc_no" %> +
    + +
    + <%= f.input :company, :class => "form-control col-md-6 company",:required => true%> + + <% flash.each do |name, msg| %> + <% str="[\"#{msg['company']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%>
    "> - <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> + <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%> + <% flash.each do |name, msg| %> - <%= msg['contact_no'] %> + <% str="[\"#{msg['contact_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> <% end -%>
    "> - <%= f.input :email, :class => "form-control col-md-6 email" %> + <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%> <% flash.each do |name, msg| %> - <%= msg['email'] %> + <% str="[\"#{msg['contact_no']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> <% end -%>
    +
    + <%= f.input :address, :class => "form-control col-md-6 address" %> +
    + +
    + + +
    +
    <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%> @@ -137,12 +197,12 @@ - - - - diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 4b85d839..e1e530e8 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -1,6 +1,6 @@
    -
    +
      @@ -23,14 +23,13 @@
      - -
      + <% @complete.each do |sale| %> +
      - - + <%= sale.receipt_no %>
      - + <% end %>
      @@ -39,15 +38,17 @@
      <% @tables.each do |table| %> <% if table.status == 'occupied' %> -
      +
      - <%= table.name %> + Zone <%= table.zone_id %>
      + Table <%= table.name %> ( <%= table.seater %> Seat )
      <% else %> -
      +
      - <%= table.name %> + Zone <%= table.zone_id %>
      + Table <%= table.name %> ( <%= table.seater %> Seat )
      <% end %> @@ -60,13 +61,13 @@
      <% @rooms.each do |room| %> <% if room.status == 'occupied' %> -
      +
      <%= room.name %>
      <% else %> -
      +
      <%= room.name %>
      @@ -79,26 +80,41 @@
      - -
      + <% @orders.each do |order| %> +
      - + <%= order.order_id %>
      - + <% end %>
      +
      + +
      diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 32b3a85c..1e2acba0 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -3,9 +3,9 @@
      -
        +
      diff --git a/config/routes.rb b/config/routes.rb index 8f9b7dea..dd5831ae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -44,10 +44,9 @@ Rails.application.routes.draw do #Order Controller resources :orders, only: [:create, :show, :update] do - post "bill" => "bill#create" - end + get 'view_orders' => "orders#view_orders" #Current active bookings resources :bookings, only: [:index, :show, :create, :update] From d9d07a1cdcbc07a27b3873ace33d1675a66778fc Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Jun 2017 18:19:44 +0630 Subject: [PATCH 043/128] update reprint --- .../origami/request_bills_controller.rb | 2 +- app/pdf/receipt_bill_pdf.rb | 4 +++- app/views/crm/customers/index.html.erb | 2 +- app/views/crm/dining_queues/index.html.erb | 15 +++++++++------ app/views/origami/sales/show.html.erb | 8 +++++++- config/routes.rb | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 360274fa..37eef687 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -37,7 +37,7 @@ class Origami::RequestBillsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total,member_info) - redirect_to origami_path(@sale_data.sale_id) + # redirect_to origami_path(@sale_data.sale_id) end end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 516f5668..bdeb58a3 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -250,14 +250,16 @@ class ReceiptBillPdf < Prawn::Document end move_down 5 end - stroke_horizontal_rule + end # show member information def member_info(member_info,customer_name,rebate_amount,sale_data) if rebate_amount != nil + if rebate_amount["status"] == true + stroke_horizontal_rule rebate_amount["data"].each do |res| if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Rebate" diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index a8f02920..e7b47460 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -28,7 +28,7 @@ - +
      <% end %> diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index 502bcd3f..ac247771 100644 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -12,20 +12,23 @@
      -
      +
      -
      -
      -
      +
      +
      +
      <% @i =0 %> <% @dining_queues.each do |queue| %>
      " data-id="<%= queue.id %>">
      - <%= @i += 1 %> . Queue No -

      <%= queue.queue_no %>

      + + <%= @i += 1 %> . Queue No +

      + <%= queue.queue_no %> +

      diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 81face96..e896a50a 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -175,7 +175,7 @@
      - +
      @@ -206,4 +206,10 @@ $('#pay').on('click',function() { $('#back').on('click',function(){ window.location.href = '/origami/'; }) +$('#re-print').click(function() { + var sale_id = $('#sale_id').val(); + window.location.href = '/origami/'+ sale_id + "/reprint" + + return false; + }); diff --git a/config/routes.rb b/config/routes.rb index 90c7b0e8..29c1960e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -89,7 +89,7 @@ Rails.application.routes.draw do get "/:id/discount" => "discounts#index" post "/:id/discount" => "discounts#create" - post "/:id/request_bills" => "request_bills#print" + post "/:id/request_bills" => "request_bills#print" ,:defaults => { :format => 'json' } get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' From c7139609c422f0f49f0bc87e06658f0f575b9dd7 Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 21 Jun 2017 18:26:03 +0630 Subject: [PATCH 044/128] move table --- app/controllers/origami/home_controller.rb | 1 + app/controllers/origami/movetable_controller.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index a7fec897..84a46622 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -17,6 +17,7 @@ class Origami::HomeController < BaseOrigamiController @status_order = "" @order_items = Array.new @dining.bookings.each do |booking| + if booking.sale_id.nil? booking.booking_orders.each do |booking_order| diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 74e5810e..c5b2b2fc 100644 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -10,9 +10,11 @@ class Origami::MovetableController < BaseOrigamiController @dining = DiningFacility.find(params[:dining_id]) @order_items = Array.new @dining.bookings.each do |booking| + if booking.sale_id.nil? booking.booking_orders.each do |booking_order| + order = Order.find(booking_order.order_id) @obj_order = order @date = order.created_at From 3ba836b4466193fff94e13bfa9f60af1f12f15f9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Jun 2017 18:29:02 +0630 Subject: [PATCH 045/128] update customer transaction --- .../transactions/sales_controller.rb | 8 +- app/views/crm/customers/show.html.erb | 4 +- app/views/transactions/sales/show.html.erb | 114 +++++++++--------- 3 files changed, 60 insertions(+), 66 deletions(-) diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index fed62a34..0a069b1b 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -53,13 +53,7 @@ class Transactions::SalesController < ApplicationController #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 + @response = Customer.get_membership_transactions(@customer) #end customer amount respond_to do |format| diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 6f61e3cb..5bdb9703 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -47,7 +47,7 @@ Redeem Rebate Balance - Account No + Status Receipt No @@ -60,7 +60,7 @@ <%= transaction["redeem"]%> <%= transaction["rebate"] %> <%= transaction["balance"] %> - <%= transaction["account_no"] %> + <%= transaction["status"] %> <%= transaction["receipt_no"] %> diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 7fdec433..04343380 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -175,63 +175,63 @@
      - -
      -
      -
      -
      -

      Customer Profile

      -
      - - - - - - - - - - - - - - - - - - - - - - - -
      Name<%= @customer.name %>
      Email<%= @customer.email %>
      Contact no<%= @customer.contact_no %>
      Company<%= @customer.company %>
      Date Of Birth<%= @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"] %>
      -
      -
      -
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% + if @response["status"] == true %> + <% @response["data"].each do |transaction| %> + + + + + + + + + + + <% end %> + <% end %> + +
      Card NoNameCompanyContact noEmailNRC/Passport NoAddressDOB
      <%= @customer.card_no rescue '-'%><%= @customer.name %><%= @customer.company rescue '-' %><%= @customer.contact_no %><%= @customer.email %><%= @customer.nrc_no %><%= @customer.address%><%= @customer.date_of_birth %>
      Membership Transactions
      DateRedeemRebateBalanceStatusReceipt No
      <%= transaction["date"]%><%= transaction["redeem"]%><%= transaction["rebate"] %><%= transaction["balance"] %><%= transaction["status"] %><%= transaction["receipt_no"] %>
      From a6912d4e5bd99b7d665cc1436b7d0decd57d8d46 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Jun 2017 18:30:51 +0630 Subject: [PATCH 046/128] update customer search in card no --- app/models/customer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index e5dfb668..4e25c9bc 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -64,7 +64,7 @@ class Customer < ApplicationRecord def self.search(search) if search # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) - where("name LIKE ? OR contact_no LIKE ? OR card_no LIKE ?", "%#{search}%", "%#{search}%",) + where("name LIKE ? OR contact_no LIKE ? OR card_no LIKE ?", "%#{search}%", "%#{search}%", "%#{search}%",) else find(:all) end From d95b7c7abcec0e1210228c1177f22a12d1b76639 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Jun 2017 19:20:10 +0630 Subject: [PATCH 047/128] add confirm js and css --- app/assets/javascripts/jquery-confirm.js | 10 ++++++++++ app/assets/stylesheets/jquery-confirm.scss | 10 ++++++++++ app/views/crm/dining_queues/assign.html.erb | 4 ++-- app/views/layouts/CRM.html.erb | 2 ++ app/views/layouts/origami.html.erb | 2 ++ app/views/origami/customers/index.html.erb | 2 -- config/initializers/assets.rb | 4 ++++ 7 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/jquery-confirm.js create mode 100644 app/assets/stylesheets/jquery-confirm.scss diff --git a/app/assets/javascripts/jquery-confirm.js b/app/assets/javascripts/jquery-confirm.js new file mode 100644 index 00000000..43d8889b --- /dev/null +++ b/app/assets/javascripts/jquery-confirm.js @@ -0,0 +1,10 @@ +/*! + * jquery-confirm v3.2.3 (http://craftpip.github.io/jquery-confirm/) + * Author: Boniface Pereira + * Website: www.craftpip.com + * Contact: hey@craftpip.com + * + * Copyright 2013-2017 jquery-confirm + * Licensed under MIT (https://github.com/craftpip/jquery-confirm/blob/master/LICENSE) + */ +if(typeof jQuery==="undefined"){throw new Error("jquery-confirm requires jQuery");}var jconfirm,Jconfirm;(function($,window){$.fn.confirm=function(options,option2){if(typeof options==="undefined"){options={};}if(typeof options==="string"){options={content:options,title:(option2)?option2:false};}$(this).each(function(){var $this=$(this);$this.on("click",function(e){e.preventDefault();var jcOption=$.extend({},options);if($this.attr("data-title")){jcOption.title=$this.attr("data-title");}if($this.attr("data-content")){jcOption.content=$this.attr("data-content");}if(typeof jcOption.buttons=="undefined"){jcOption.buttons={};}jcOption["$target"]=$this;if($this.attr("href")&&Object.keys(jcOption.buttons).length==0){var buttons=$.extend(true,{},jconfirm.pluginDefaults.defaultButtons,(jconfirm.defaults||{}).defaultButtons||{});var firstBtn=Object.keys(buttons)[0];jcOption.buttons=buttons;jcOption.buttons[firstBtn].action=function(){location.href=$this.attr("href");};}jcOption.closeIcon=false;$.confirm(jcOption);});});return $(this);};$.confirm=function(options,option2){if(typeof options==="undefined"){options={};}if(typeof options==="string"){options={content:options,title:(option2)?option2:false};}if(typeof options.buttons!="object"){options.buttons={};}if(Object.keys(options.buttons).length==0){var buttons=$.extend(true,{},jconfirm.pluginDefaults.defaultButtons,(jconfirm.defaults||{}).defaultButtons||{});options.buttons=buttons;}return jconfirm(options);};$.alert=function(options,option2){if(typeof options==="undefined"){options={};}if(typeof options==="string"){options={content:options,title:(option2)?option2:false};}if(typeof options.buttons!="object"){options.buttons={};}if(Object.keys(options.buttons).length==0){var buttons=$.extend(true,{},jconfirm.pluginDefaults.defaultButtons,(jconfirm.defaults||{}).defaultButtons||{});var firstBtn=Object.keys(buttons)[0];options.buttons[firstBtn]=buttons[firstBtn];}return jconfirm(options);};$.dialog=function(options,option2){if(typeof options==="undefined"){options={};}if(typeof options==="string"){options={content:options,title:(option2)?option2:false,closeIcon:function(){}};}options.buttons={};if(typeof options.closeIcon=="undefined"){options.closeIcon=function(){};}options.confirmKeys=[13];return jconfirm(options);};jconfirm=function(options){if(typeof options==="undefined"){options={};}var pluginOptions=$.extend(true,{},jconfirm.pluginDefaults);if(jconfirm.defaults){pluginOptions=$.extend(true,pluginOptions,jconfirm.defaults);}pluginOptions=$.extend(true,{},pluginOptions,options);var instance=new Jconfirm(pluginOptions);jconfirm.instances.push(instance);return instance;};Jconfirm=function(options){$.extend(this,options);this._init();};Jconfirm.prototype={_init:function(){var that=this;if(!jconfirm.instances.length){jconfirm.lastFocused=$("body").find(":focus");}this._id=Math.round(Math.random()*99999);if(!this.lazyOpen){setTimeout(function(){that.open();},0);}},_buildHTML:function(){var that=this;this._parseAnimation(this.animation,"o");this._parseAnimation(this.closeAnimation,"c");this._parseBgDismissAnimation(this.backgroundDismissAnimation);this._parseColumnClass(this.columnClass);this._parseTheme(this.theme);this._parseType(this.type);var template=$(this.template);template.find(".jconfirm-box").addClass(this.animationParsed).addClass(this.backgroundDismissAnimationParsed).addClass(this.typeParsed);if(this.typeAnimated){template.find(".jconfirm-box").addClass("jconfirm-type-animated");}if(this.useBootstrap){template.find(".jc-bs3-row").addClass(this.bootstrapClasses.row);template.find(".jc-bs3-row").addClass("justify-content-md-center justify-content-sm-center justify-content-xs-center justify-content-lg-center");template.find(".jconfirm-box-container").addClass(this.columnClassParsed);if(this.containerFluid){template.find(".jc-bs3-container").addClass(this.bootstrapClasses.containerFluid);}else{template.find(".jc-bs3-container").addClass(this.bootstrapClasses.container);}}else{template.find(".jconfirm-box").css("width",this.boxWidth);}if(this.titleClass){template.find(".jconfirm-title-c").addClass(this.titleClass);}template.addClass(this.themeParsed);var ariaLabel="jconfirm-box"+this._id;template.find(".jconfirm-box").attr("aria-labelledby",ariaLabel).attr("tabindex",-1);template.find(".jconfirm-content").attr("id",ariaLabel);if(this.bgOpacity!=null){template.find(".jconfirm-bg").css("opacity",this.bgOpacity);}if(this.rtl){template.addClass("jconfirm-rtl");}this.$el=template.appendTo(this.container);this.$jconfirmBoxContainer=this.$el.find(".jconfirm-box-container");this.$jconfirmBox=this.$body=this.$el.find(".jconfirm-box");this.$jconfirmBg=this.$el.find(".jconfirm-bg");this.$title=this.$el.find(".jconfirm-title");this.$titleContainer=this.$el.find(".jconfirm-title-c");this.$content=this.$el.find("div.jconfirm-content");this.$contentPane=this.$el.find(".jconfirm-content-pane");this.$icon=this.$el.find(".jconfirm-icon-c");this.$closeIcon=this.$el.find(".jconfirm-closeIcon");this.$btnc=this.$el.find(".jconfirm-buttons");this.$scrollPane=this.$el.find(".jconfirm-scrollpane");this._contentReady=$.Deferred();this._modalReady=$.Deferred();this.setTitle();this.setIcon();this._setButtons();this._parseContent();this.initDraggable();if(this.isAjax){this.showLoading(false);}$.when(this._contentReady,this._modalReady).then(function(){if(that.isAjaxLoading){setTimeout(function(){that.isAjaxLoading=false;that.setContent();that.setTitle();that.setIcon();setTimeout(function(){that.hideLoading(false);},100);if(typeof that.onContentReady=="function"){that.onContentReady();}},50);}else{that.setContent();that.setTitle();that.setIcon();if(typeof that.onContentReady=="function"){that.onContentReady();}}if(that.autoClose){that._startCountDown();}});that._contentHash=this._hash(that.$content.html());that._contentHeight=this.$content.height();this._watchContent();this.setDialogCenter();if(this.animation=="none"){this.animationSpeed=1;this.animationBounce=1;}this.$body.css(this._getCSS(this.animationSpeed,this.animationBounce));this.$contentPane.css(this._getCSS(this.animationSpeed,1));this.$jconfirmBg.css(this._getCSS(this.animationSpeed,1));},_typePrefix:"jconfirm-type-",typeParsed:"",_parseType:function(type){this.typeParsed=this._typePrefix+type;},setType:function(type){var oldClass=this.typeParsed;this._parseType(type);this.$jconfirmBox.removeClass(oldClass).addClass(this.typeParsed);},themeParsed:"",_themePrefix:"jconfirm-",setTheme:function(theme){var previous=this.theme;this.theme=theme||this.theme;this._parseTheme(this.theme);if(previous){this.$el.removeClass(previous);}this.$el.addClass(this.themeParsed);this.theme=theme;},_parseTheme:function(theme){var that=this;theme=theme.split(",");$.each(theme,function(k,a){if(a.indexOf(that._themePrefix)==-1){theme[k]=that._themePrefix+$.trim(a);}});this.themeParsed=theme.join(" ").toLowerCase();},backgroundDismissAnimationParsed:"",_bgDismissPrefix:"jconfirm-hilight-",_parseBgDismissAnimation:function(bgDismissAnimation){var animation=bgDismissAnimation.split(",");var that=this;$.each(animation,function(k,a){if(a.indexOf(that._bgDismissPrefix)==-1){animation[k]=that._bgDismissPrefix+$.trim(a);}});this.backgroundDismissAnimationParsed=animation.join(" ").toLowerCase();},animationParsed:"",closeAnimationParsed:"",_animationPrefix:"jconfirm-animation-",setAnimation:function(animation){this.animation=animation||this.animation;this._parseAnimation(this.animation,"o");},_parseAnimation:function(animation,which){which=which||"o";var animations=animation.split(",");var that=this;$.each(animations,function(k,a){if(a.indexOf(that._animationPrefix)==-1){animations[k]=that._animationPrefix+$.trim(a);}});var a_string=animations.join(" ").toLowerCase();if(which=="o"){this.animationParsed=a_string;}else{this.closeAnimationParsed=a_string;}return a_string;},setCloseAnimation:function(closeAnimation){this.closeAnimation=closeAnimation||this.closeAnimation;this._parseAnimation(this.closeAnimation,"c");},setAnimationSpeed:function(speed){this.animationSpeed=speed||this.animationSpeed;},columnClassParsed:"",setColumnClass:function(colClass){if(!this.useBootstrap){console.warn("cannot set columnClass, useBootstrap is set to false");return;}this.columnClass=colClass||this.columnClass;this._parseColumnClass(this.columnClass);this.$jconfirmBoxContainer.addClass(this.columnClassParsed);},setBoxWidth:function(){if(this.useBootstrap){console.warn("cannot set boxWidth, useBootstrap is set to true");return;}this.$jconfirmBox.css("width",this.boxWidth);},_parseColumnClass:function(colClass){colClass=colClass.toLowerCase();var p;switch(colClass){case"xl":case"xlarge":p="col-md-12";break;case"l":case"large":p="col-md-8 col-md-offset-2";break;case"m":case"medium":p="col-md-6 col-md-offset-3";break;case"s":case"small":p="col-md-4 col-md-offset-4";break;case"xs":case"xsmall":p="col-md-2 col-md-offset-5";break;default:p=colClass;}this.columnClassParsed=p;},initDraggable:function(){var that=this;var $t=this.$titleContainer;this.resetDrag();if(this.draggable){$t.addClass("jconfirm-hand");$t.on("mousedown",function(e){that.mouseX=e.clientX;that.mouseY=e.clientY;that.isDrag=true;});$(window).on("mousemove."+this._id,function(e){if(that.isDrag){that.movingX=e.clientX-that.mouseX+that.initialX;that.movingY=e.clientY-that.mouseY+that.initialY;that.setDrag();}});$(window).on("mouseup."+this._id,function(){if(that.isDrag){that.isDrag=false;that.initialX=that.movingX;that.initialY=that.movingY;}});}},resetDrag:function(){this.isDrag=false;this.initialX=0;this.initialY=0;this.movingX=0;this.movingY=0;this.movingXCurrent=0;this.movingYCurrent=0;this.mouseX=0;this.mouseY=0;this.$jconfirmBoxContainer.css("transform","translate("+0+"px, "+0+"px)");},setDrag:function(){if(!this.draggable){return;}this.alignMiddle=false;this._boxWidth=this.$jconfirmBox.outerWidth();var ww=$(window).width();var that=this;if(that.movingX%2==0||that.movingY%2==0){var tb=that._boxTopMargin-that.dragWindowGap;if(tb+that.movingY<0){that.movingY=-tb;}else{that.movingYCurrent=that.movingY;}var lb=(ww/2)-that._boxWidth/2;var rb=(ww/2)+(that._boxWidth/2)-that._boxWidth;rb-=that.dragWindowGap;lb-=that.dragWindowGap;if(lb+that.movingX<0){that.movingX=-lb;}else{if(rb-that.movingX<0){that.movingX=rb;}else{that.movingXCurrent=that.movingX;}}that.$jconfirmBoxContainer.css("transform","translate("+that.movingX+"px, "+that.movingY+"px)");}},_hash:function(a){var string=a.toString();var h=0;if(string.length==0){return h;}for(var i=0;i').html(that.buttons[key].text).addClass(that.buttons[key].btnClass).prop("disabled",that.buttons[key].isDisabled).css("display",that.buttons[key].isHidden?"none":"").click(function(e){e.preventDefault();var res=that.buttons[key].action.apply(that);that.onAction(key);that._stopCountDown();if(typeof res==="undefined"||res){that.close();}});that.buttons[key].el=button_element;that.buttons[key].setText=function(text){button_element.html(text);};that.buttons[key].addClass=function(className){button_element.addClass(className);};that.buttons[key].removeClass=function(className){button_element.removeClass(className);};that.buttons[key].disable=function(){that.buttons[key].isDisabled=true;button_element.prop("disabled",true);};that.buttons[key].enable=function(){that.buttons[key].isDisabled=false;button_element.prop("disabled",false);};that.buttons[key].show=function(){that.buttons[key].isHidden=false;button_element.css("display","");that.setDialogCenter();};that.buttons[key].hide=function(){that.buttons[key].isHidden=true;button_element.css("display","none");that.setDialogCenter();};that["$_"+key]=that["$$"+key]=button_element;that.$btnc.append(button_element);});if(total_buttons===0){this.$btnc.hide();}if(this.closeIcon===null&&total_buttons===0){this.closeIcon=true;}if(this.closeIcon){if(this.closeIconClass){var closeHtml='';this.$closeIcon.html(closeHtml);}this.$closeIcon.click(function(e){e.preventDefault();var buttonName=false;var shouldClose=false;var str;if(typeof that.closeIcon=="function"){str=that.closeIcon();}else{str=that.closeIcon;}if(typeof str=="string"&&typeof that.buttons[str]!="undefined"){buttonName=str;shouldClose=false;}else{if(typeof str=="undefined"||!!(str)==true){shouldClose=true;}else{shouldClose=false;}}if(buttonName){var btnResponse=that.buttons[buttonName].action.apply(that);shouldClose=(typeof btnResponse=="undefined")||!!(btnResponse);}if(shouldClose){that.close();}});this.$closeIcon.show();}else{this.$closeIcon.hide();}},setTitle:function(string,force){force=force||false;if(typeof string!=="undefined"){if(typeof string=="string"){this.title=string;}else{if(typeof string=="function"){if(typeof string.promise=="function"){console.error("Promise was returned from title function, this is not supported.");}var response=string();if(typeof response=="string"){this.title=response;}else{this.title=false;}}else{this.title=false;}}}if(this.isAjaxLoading&&!force){return;}this.$title.html(this.title||"");},setIcon:function(iconClass,force){force=force||false;if(typeof iconClass!=="undefined"){if(typeof iconClass=="string"){this.icon=iconClass;}else{if(typeof iconClass==="function"){var response=iconClass();if(typeof response=="string"){this.icon=response;}else{this.icon=false;}}else{this.icon=false;}}}if(this.isAjaxLoading&&!force){return;}this.$icon.html(this.icon?'':"");},setContentPrepend:function(string,force){this.contentParsed=string+this.contentParsed;if(this.isAjaxLoading&&!force){return;}this.$content.prepend(string);},setContentAppend:function(string,force){this.contentParsed=this.contentParsed+string;if(this.isAjaxLoading&&!force){return;}this.$content.append(string);},setContent:function(string,force){force=force||false;var that=this;this.contentParsed=(typeof string=="undefined")?this.contentParsed:string;if(this.isAjaxLoading&&!force){return;}this.$content.html(this.contentParsed);this.setDialogCenter();setTimeout(function(){that.$body.find("input[autofocus]:visible:first").focus();},100);},loadingSpinner:false,showLoading:function(disableButtons){this.loadingSpinner=true;this.$jconfirmBox.addClass("loading");if(disableButtons){this.$btnc.find("button").prop("disabled",true);}this.setDialogCenter();},hideLoading:function(enableButtons){this.loadingSpinner=false;this.$jconfirmBox.removeClass("loading");if(enableButtons){this.$btnc.find("button").prop("disabled",false);}this.setDialogCenter();},ajaxResponse:false,contentParsed:"",isAjax:false,isAjaxLoading:false,_parseContent:function(){var that=this;var e=" ";if(typeof this.content=="function"){var res=this.content.apply(this);if(typeof res=="string"){this.content=res;}else{if(typeof res=="object"&&typeof res.always=="function"){this.isAjax=true;this.isAjaxLoading=true;res.always(function(data,status,xhr){that.ajaxResponse={data:data,status:status,xhr:xhr};that._contentReady.resolve(data,status,xhr);if(typeof that.contentLoaded=="function"){that.contentLoaded(data,status,xhr);}});this.content=e;}else{this.content=e;}}}if(typeof this.content=="string"&&this.content.substr(0,4).toLowerCase()==="url:"){this.isAjax=true;this.isAjaxLoading=true;var u=this.content.substring(4,this.content.length);$.get(u).done(function(html){that.contentParsed=html;}).always(function(data,status,xhr){that.ajaxResponse={data:data,status:status,xhr:xhr};that._contentReady.resolve(data,status,xhr);if(typeof that.contentLoaded=="function"){that.contentLoaded(data,status,xhr);}});}if(!this.content){this.content=e;}if(!this.isAjax){this.contentParsed=this.content;this.setContent(this.contentParsed);that._contentReady.resolve();}},_stopCountDown:function(){clearInterval(this.autoCloseInterval);if(this.$cd){this.$cd.remove();}},_startCountDown:function(){var that=this;var opt=this.autoClose.split("|");if(opt.length!==2){console.error("Invalid option for autoClose. example 'close|10000'");return false;}var button_key=opt[0];var time=parseInt(opt[1]);if(typeof this.buttons[button_key]==="undefined"){console.error("Invalid button key '"+button_key+"' for autoClose");return false;}var seconds=Math.ceil(time/1000);this.$cd=$(' ('+seconds+")").appendTo(this["$_"+button_key]);this.autoCloseInterval=setInterval(function(){that.$cd.html(" ("+(seconds-=1)+") ");if(seconds<=0){that["$$"+button_key].trigger("click");that._stopCountDown();}},1000);},_getKey:function(key){switch(key){case 192:return"tilde";case 13:return"enter";case 16:return"shift";case 9:return"tab";case 20:return"capslock";case 17:return"ctrl";case 91:return"win";case 18:return"alt";case 27:return"esc";case 32:return"space";}var initial=String.fromCharCode(key);if(/^[A-z0-9]+$/.test(initial)){return initial.toLowerCase();}else{return false;}},reactOnKey:function(e){var that=this;var a=$(".jconfirm");if(a.eq(a.length-1)[0]!==this.$el[0]){return false;}var key=e.which;if(this.$content.find(":input").is(":focus")&&/13|32/.test(key)){return false;}var keyChar=this._getKey(key);if(keyChar==="esc"&&this.escapeKey){if(this.escapeKey===true){this.$scrollPane.trigger("click");}else{if(typeof this.escapeKey==="string"||typeof this.escapeKey==="function"){var buttonKey;if(typeof this.escapeKey==="function"){buttonKey=this.escapeKey();}else{buttonKey=this.escapeKey;}if(buttonKey){if(typeof this.buttons[buttonKey]==="undefined"){console.warn("Invalid escapeKey, no buttons found with key "+buttonKey);}else{this["$_"+buttonKey].trigger("click");}}}}}$.each(this.buttons,function(key,button){if(button.keys.indexOf(keyChar)!=-1){that["$_"+key].trigger("click");}});},_boxTopMargin:0,_boxBottomMargin:0,_boxWidth:0,setDialogCenter:function(){var contentHeight;var paneHeight;var style;contentHeight=0;paneHeight=0;if(this.$contentPane.css("display")!="none"){contentHeight=this.$content.outerHeight()||0;paneHeight=this.$contentPane.height()||0;}var children=this.$content.children();if(children.length!=0){var marginTopChild=parseInt(children.eq(0).css("margin-top"));if(marginTopChild){contentHeight+=marginTopChild;}}if(paneHeight==0){paneHeight=contentHeight;}var windowHeight=$(window).height();var boxHeight;boxHeight=(this.$body.outerHeight()-paneHeight)+contentHeight;var topMargin=(windowHeight-boxHeight)/2;if(boxHeight>(windowHeight-(this.offsetTop+this.offsetBottom))||!this.alignMiddle){style={"margin-top":this.offsetTop,"margin-bottom":this.offsetBottom};this._boxTopMargin=this.offsetTop;this._boxBottomMargin=this.offsetBottom;$("body").addClass("jconfirm-no-scroll-"+this._id);}else{style={"margin-top":topMargin,"margin-bottom":this.offsetBottom};this._boxTopMargin=topMargin;this._boxBottomMargin=this.offsetBottom;$("body").removeClass("jconfirm-no-scroll-"+this._id);}this.$contentPane.css({height:contentHeight}).scrollTop(0);this.$body.css(style);this.setDrag();},_unwatchContent:function(){clearInterval(this._timer);},close:function(){var that=this;if(typeof this.onClose==="function"){this.onClose();}this._unwatchContent();clearInterval(this.imageLoadInterval);$(window).unbind("resize."+this._id);$(window).unbind("keyup."+this._id);$(window).unbind("jcKeyDown."+this._id);if(this.draggable){$(window).unbind("mousemove."+this._id);$(window).unbind("mouseup."+this._id);this.$titleContainer.unbind("mousedown");}$("body").removeClass("jconfirm-no-scroll-"+this._id);this.$body.addClass(this.closeAnimationParsed);this.$jconfirmBg.addClass("jconfirm-bg-h");var closeTimer=(this.closeAnimation=="none")?1:this.animationSpeed;that.$el.removeClass(that.loadedClass);setTimeout(function(){that.$el.remove();var l=jconfirm.instances;var i=jconfirm.instances.length-1;for(i;i>=0;i--){if(jconfirm.instances[i]._id==that._id){jconfirm.instances.splice(i,1);}}if(!jconfirm.instances.length){if(that.scrollToPreviousElement&&jconfirm.lastFocused&&jconfirm.lastFocused.length&&$.contains(document,jconfirm.lastFocused[0])){var $lf=jconfirm.lastFocused;if(that.scrollToPreviousElementAnimate){var st=$(window).scrollTop();var ot=jconfirm.lastFocused.offset().top;var wh=$(window).height();if(!(ot>st&&ot<(st+wh))){var scrollTo=(ot-Math.round((wh/3)));$("html, body").animate({scrollTop:scrollTo},that.animationSpeed,"swing",function(){$lf.focus();});}else{$lf.focus();}}else{$lf.focus();}jconfirm.lastFocused=false;}}if(typeof that.onDestroy=="function"){that.onDestroy();}},closeTimer*0.4);return true;},open:function(){if(this.isOpen()){return false;}this._buildHTML();this._bindEvents();this._open();return true;},_open:function(){var that=this;if(typeof that.onOpenBefore=="function"){that.onOpenBefore();}this.$body.removeClass(this.animationParsed);this.$jconfirmBg.removeClass("jconfirm-bg-h");this.$body.focus();setTimeout(function(){that.$body.css(that._getCSS(that.animationSpeed,1));that.$body.css({"transition-property":that.$body.css("transition-property")+", margin"});that._modalReady.resolve();if(typeof that.onOpen==="function"){that.onOpen();}that.$el.addClass(that.loadedClass);},this.animationSpeed);},loadedClass:"jconfirm-open",isClosed:function(){return !this.$el||this.$el.css("display")==="";},isOpen:function(){return !this.isClosed();},toggle:function(){if(!this.isOpen()){this.open();}else{this.close();}}};jconfirm.instances=[];jconfirm.lastFocused=false;jconfirm.pluginDefaults={template:'
      ',title:"Hello",titleClass:"",type:"default",typeAnimated:true,draggable:false,alignMiddle:true,content:"Are you sure to continue?",buttons:{},defaultButtons:{ok:{action:function(){}},close:{action:function(){}}},contentLoaded:function(){},icon:"",lazyOpen:false,bgOpacity:null,theme:"light",animation:"zoom",closeAnimation:"scale",animationSpeed:400,animationBounce:1.2,escapeKey:true,rtl:false,container:"body",containerFluid:false,backgroundDismiss:false,backgroundDismissAnimation:"shake",autoClose:false,closeIcon:null,closeIconClass:false,watchInterval:100,columnClass:"col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3 col-xs-10 col-xs-offset-1",boxWidth:"50%",scrollToPreviousElement:true,scrollToPreviousElementAnimate:true,useBootstrap:true,offsetTop:50,offsetBottom:50,dragWindowGap:15,bootstrapClasses:{container:"container",containerFluid:"container-fluid",row:"row"},onContentReady:function(){},onOpenBefore:function(){},onOpen:function(){},onClose:function(){},onDestroy:function(){},onAction:function(){}};var keyDown=false;$(window).on("keydown",function(e){if(!keyDown){var $target=$(e.target);var pass=false;if($target.closest(".jconfirm-box").length){pass=true;}if(pass){$(window).trigger("jcKeyDown");}keyDown=true;}});$(window).on("keyup",function(e){keyDown=false;});})(jQuery,window); \ No newline at end of file diff --git a/app/assets/stylesheets/jquery-confirm.scss b/app/assets/stylesheets/jquery-confirm.scss new file mode 100644 index 00000000..3c16dc8d --- /dev/null +++ b/app/assets/stylesheets/jquery-confirm.scss @@ -0,0 +1,10 @@ +/*! + * jquery-confirm v3.2.3 (http://craftpip.github.io/jquery-confirm/) + * Author: boniface pereira + * Website: www.craftpip.com + * Contact: hey@craftpip.com + * + * Copyright 2013-2017 jquery-confirm + * Licensed under MIT (https://github.com/craftpip/jquery-confirm/blob/master/LICENSE) + */@-webkit-keyframes + jconfirm-spin{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes jconfirm-spin{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}body[class*=jconfirm-no-scroll-]{overflow:hidden!important}.jconfirm{position:fixed;top:0;left:0;right:0;bottom:0;z-index:99999999;font-family:inherit;overflow:hidden}.jconfirm .jconfirm-bg{position:fixed;top:0;left:0;right:0;bottom:0;-webkit-transition:opacity .4s;transition:opacity .4s}.jconfirm .jconfirm-bg.jconfirm-bg-h{opacity:0!important}.jconfirm .jconfirm-scrollpane{position:fixed;top:0;left:0;right:0;bottom:0;overflow-y:auto;-webkit-perspective:500px;perspective:500px;-webkit-perspective-origin:center;perspective-origin:center}.jconfirm .jconfirm-box{background:white;border-radius:4px;position:relative;outline:0;padding:15px 15px 0;overflow:hidden;margin-left:auto;margin-right:auto}@-webkit-keyframes type-blue{1%,100%{border-color:#3498db}50%{border-color:#5faee3}}@keyframes type-blue{1%,100%{border-color:#3498db}50%{border-color:#5faee3}}@-webkit-keyframes type-green{1%,100%{border-color:#2ecc71}50%{border-color:#54d98c}}@keyframes type-green{1%,100%{border-color:#2ecc71}50%{border-color:#54d98c}}@-webkit-keyframes type-red{1%,100%{border-color:#e74c3c}50%{border-color:#ed7669}}@keyframes type-red{1%,100%{border-color:#e74c3c}50%{border-color:#ed7669}}@-webkit-keyframes type-orange{1%,100%{border-color:#f1c40f}50%{border-color:#f4d03f}}@keyframes type-orange{1%,100%{border-color:#f1c40f}50%{border-color:#f4d03f}}@-webkit-keyframes type-purple{1%,100%{border-color:#9b59b6}50%{border-color:#b07cc6}}@keyframes type-purple{1%,100%{border-color:#9b59b6}50%{border-color:#b07cc6}}@-webkit-keyframes type-dark{1%,100%{border-color:#34495e}50%{border-color:#46627f}}@keyframes type-dark{1%,100%{border-color:#34495e}50%{border-color:#46627f}}.jconfirm .jconfirm-box.jconfirm-type-animated{-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.jconfirm .jconfirm-box.jconfirm-type-blue{border-top:solid 7px #3498db;-webkit-animation-name:type-blue;animation-name:type-blue}.jconfirm .jconfirm-box.jconfirm-type-green{border-top:solid 7px #2ecc71;-webkit-animation-name:type-green;animation-name:type-green}.jconfirm .jconfirm-box.jconfirm-type-red{border-top:solid 7px #e74c3c;-webkit-animation-name:type-red;animation-name:type-red}.jconfirm .jconfirm-box.jconfirm-type-orange{border-top:solid 7px #f1c40f;-webkit-animation-name:type-orange;animation-name:type-orange}.jconfirm .jconfirm-box.jconfirm-type-purple{border-top:solid 7px #9b59b6;-webkit-animation-name:type-purple;animation-name:type-purple}.jconfirm .jconfirm-box.jconfirm-type-dark{border-top:solid 7px #34495e;-webkit-animation-name:type-dark;animation-name:type-dark}.jconfirm .jconfirm-box.loading{height:120px}.jconfirm .jconfirm-box.loading:before{content:'';position:absolute;left:0;background:white;right:0;top:0;bottom:0;border-radius:10px;z-index:1}.jconfirm .jconfirm-box.loading:after{opacity:.6;content:'';height:30px;width:30px;border:solid 3px transparent;position:absolute;left:50%;margin-left:-15px;border-radius:50%;-webkit-animation:jconfirm-spin 1s infinite linear;animation:jconfirm-spin 1s infinite linear;border-bottom-color:dodgerblue;top:50%;margin-top:-15px;z-index:2}.jconfirm .jconfirm-box div.jconfirm-closeIcon{height:20px;width:20px;position:absolute;top:5px;right:5px;cursor:pointer;opacity:.6;text-align:center;-webkit-transition:opacity .3s ease-in;transition:opacity .3s ease-in;font-size:27px!important;line-height:14px!important;display:none}.jconfirm .jconfirm-box div.jconfirm-closeIcon:empty{display:none}.jconfirm .jconfirm-box div.jconfirm-closeIcon .fa{font-size:16px}.jconfirm .jconfirm-box div.jconfirm-closeIcon .glyphicon{font-size:16px}.jconfirm .jconfirm-box div.jconfirm-closeIcon .zmdi{font-size:16px}.jconfirm .jconfirm-box div.jconfirm-closeIcon:hover{opacity:1}.jconfirm .jconfirm-box div.jconfirm-title-c{display:block;font-size:22px;line-height:20px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jconfirm .jconfirm-box div.jconfirm-title-c.jconfirm-hand{cursor:move}.jconfirm .jconfirm-box div.jconfirm-title-c .jconfirm-icon-c{font-size:inherit;padding-bottom:15px;display:inline-block;vertical-align:middle}.jconfirm .jconfirm-box div.jconfirm-title-c .jconfirm-icon-c i{vertical-align:middle}.jconfirm .jconfirm-box div.jconfirm-title-c .jconfirm-icon-c:empty{display:none}.jconfirm .jconfirm-box div.jconfirm-title-c .jconfirm-title{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:inherit;font-family:inherit;display:inline-block;vertical-align:middle;padding-bottom:15px}.jconfirm .jconfirm-box div.jconfirm-title-c .jconfirm-title:empty{display:none}.jconfirm .jconfirm-box div.jconfirm-content-pane{margin-bottom:15px;height:auto;-webkit-transition:height .4s ease-in;transition:height .4s ease-in;display:inline-block;width:100%;position:relative;overflow:hidden}.jconfirm .jconfirm-box div.jconfirm-content-pane .jconfirm-content img{max-width:100%;height:auto}.jconfirm .jconfirm-box div.jconfirm-content-pane .jconfirm-content:empty{display:none}.jconfirm .jconfirm-box .jconfirm-buttons{padding-bottom:11px}.jconfirm .jconfirm-box .jconfirm-buttons>button{margin-bottom:4px;margin-left:2px;margin-right:2px}.jconfirm .jconfirm-box .jconfirm-buttons button{display:inline-block;padding:6px 12px;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;border-radius:4px;min-height:1em;outline:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:opacity .1s ease,background-color .1s ease,color .1s ease,box-shadow .1s ease,background .1s ease;transition:opacity .1s ease,background-color .1s ease,color .1s ease,box-shadow .1s ease,background .1s ease;-webkit-tap-highlight-color:transparent;border:0;background-image:none}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-blue{background-color:#3498db;color:#FFF;text-shadow:none;-webkit-transition:background .2s;transition:background .2s}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-blue:hover{background-color:#2980b9;color:#FFF}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-green{background-color:#2ecc71;color:#FFF;text-shadow:none;-webkit-transition:background .2s;transition:background .2s}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-green:hover{background-color:#27ae60;color:#FFF}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-red{background-color:#e74c3c;color:#FFF;text-shadow:none;-webkit-transition:background .2s;transition:background .2s}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-red:hover{background-color:#c0392b;color:#FFF}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-orange{background-color:#f1c40f;color:#FFF;text-shadow:none;-webkit-transition:background .2s;transition:background .2s}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-orange:hover{background-color:#f39c12;color:#FFF}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-default{background-color:#ecf0f1;color:#000;text-shadow:none;-webkit-transition:background .2s;transition:background .2s}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-default:hover{background-color:#bdc3c7;color:#000}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-purple{background-color:#9b59b6;color:#FFF;text-shadow:none;-webkit-transition:background .2s;transition:background .2s}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-purple:hover{background-color:#8e44ad;color:#FFF}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-dark{background-color:#34495e;color:#FFF;text-shadow:none;-webkit-transition:background .2s;transition:background .2s}.jconfirm .jconfirm-box .jconfirm-buttons button.btn-dark:hover{background-color:#2c3e50;color:#FFF}.jconfirm .jconfirm-box.jconfirm-type-red .jconfirm-title-c .jconfirm-icon-c{color:#e74c3c!important}.jconfirm .jconfirm-box.jconfirm-type-blue .jconfirm-title-c .jconfirm-icon-c{color:#3498db!important}.jconfirm .jconfirm-box.jconfirm-type-green .jconfirm-title-c .jconfirm-icon-c{color:#2ecc71!important}.jconfirm .jconfirm-box.jconfirm-type-purple .jconfirm-title-c .jconfirm-icon-c{color:#9b59b6!important}.jconfirm .jconfirm-box.jconfirm-type-orange .jconfirm-title-c .jconfirm-icon-c{color:#f1c40f!important}.jconfirm .jconfirm-box.jconfirm-type-dark .jconfirm-title-c .jconfirm-icon-c{color:#34495e!important}.jconfirm .jconfirm-clear{clear:both}.jconfirm.jconfirm-rtl{direction:rtl}.jconfirm.jconfirm-rtl div.jconfirm-closeIcon{left:5px;right:auto}.jconfirm.jconfirm-white .jconfirm-bg,.jconfirm.jconfirm-light .jconfirm-bg{background-color:#444;opacity:.2}.jconfirm.jconfirm-white .jconfirm-box,.jconfirm.jconfirm-light .jconfirm-box{box-shadow:0 2px 6px rgba(0,0,0,0.2);border-radius:5px}.jconfirm.jconfirm-white .jconfirm-box .jconfirm-title-c .jconfirm-icon-c,.jconfirm.jconfirm-light .jconfirm-box .jconfirm-title-c .jconfirm-icon-c{margin-right:8px;margin-left:0}.jconfirm.jconfirm-white .jconfirm-box .jconfirm-buttons,.jconfirm.jconfirm-light .jconfirm-box .jconfirm-buttons{float:right}.jconfirm.jconfirm-white .jconfirm-box .jconfirm-buttons button,.jconfirm.jconfirm-light .jconfirm-box .jconfirm-buttons button{text-transform:uppercase;font-size:14px;font-weight:bold;text-shadow:none}.jconfirm.jconfirm-white .jconfirm-box .jconfirm-buttons button.btn-default,.jconfirm.jconfirm-light .jconfirm-box .jconfirm-buttons button.btn-default{box-shadow:none;color:#333}.jconfirm.jconfirm-white .jconfirm-box .jconfirm-buttons button.btn-default:hover,.jconfirm.jconfirm-light .jconfirm-box .jconfirm-buttons button.btn-default:hover{background:#ddd}.jconfirm.jconfirm-white.jconfirm-rtl .jconfirm-title-c .jconfirm-icon-c,.jconfirm.jconfirm-light.jconfirm-rtl .jconfirm-title-c .jconfirm-icon-c{margin-left:8px;margin-right:0}.jconfirm.jconfirm-black .jconfirm-bg,.jconfirm.jconfirm-dark .jconfirm-bg{background-color:darkslategray;opacity:.4}.jconfirm.jconfirm-black .jconfirm-box,.jconfirm.jconfirm-dark .jconfirm-box{box-shadow:0 2px 6px rgba(0,0,0,0.2);background:#444;border-radius:5px;color:white}.jconfirm.jconfirm-black .jconfirm-box .jconfirm-title-c .jconfirm-icon-c,.jconfirm.jconfirm-dark .jconfirm-box .jconfirm-title-c .jconfirm-icon-c{margin-right:8px;margin-left:0}.jconfirm.jconfirm-black .jconfirm-box .jconfirm-buttons,.jconfirm.jconfirm-dark .jconfirm-box .jconfirm-buttons{float:right}.jconfirm.jconfirm-black .jconfirm-box .jconfirm-buttons button,.jconfirm.jconfirm-dark .jconfirm-box .jconfirm-buttons button{border:0;background-image:none;text-transform:uppercase;font-size:14px;font-weight:bold;text-shadow:none;-webkit-transition:background .1s;transition:background .1s;color:white}.jconfirm.jconfirm-black .jconfirm-box .jconfirm-buttons button.btn-default,.jconfirm.jconfirm-dark .jconfirm-box .jconfirm-buttons button.btn-default{box-shadow:none;color:#fff;background:0}.jconfirm.jconfirm-black .jconfirm-box .jconfirm-buttons button.btn-default:hover,.jconfirm.jconfirm-dark .jconfirm-box .jconfirm-buttons button.btn-default:hover{background:#666}.jconfirm.jconfirm-black.jconfirm-rtl .jconfirm-title-c .jconfirm-icon-c,.jconfirm.jconfirm-dark.jconfirm-rtl .jconfirm-title-c .jconfirm-icon-c{margin-left:8px;margin-right:0}.jconfirm .jconfirm-box.hilight.jconfirm-hilight-shake{-webkit-animation:shake .82s cubic-bezier(0.36,0.07,0.19,0.97) both;animation:shake .82s cubic-bezier(0.36,0.07,0.19,0.97) both;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.jconfirm .jconfirm-box.hilight.jconfirm-hilight-glow{-webkit-animation:glow .82s cubic-bezier(0.36,0.07,0.19,0.97) both;animation:glow .82s cubic-bezier(0.36,0.07,0.19,0.97) both;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}@-webkit-keyframes shake{10%,90%{-webkit-transform:translate3d(-2px,0,0);transform:translate3d(-2px,0,0)}20%,80%{-webkit-transform:translate3d(4px,0,0);transform:translate3d(4px,0,0)}30%,50%,70%{-webkit-transform:translate3d(-8px,0,0);transform:translate3d(-8px,0,0)}40%,60%{-webkit-transform:translate3d(8px,0,0);transform:translate3d(8px,0,0)}}@keyframes shake{10%,90%{-webkit-transform:translate3d(-2px,0,0);transform:translate3d(-2px,0,0)}20%,80%{-webkit-transform:translate3d(4px,0,0);transform:translate3d(4px,0,0)}30%,50%,70%{-webkit-transform:translate3d(-8px,0,0);transform:translate3d(-8px,0,0)}40%,60%{-webkit-transform:translate3d(8px,0,0);transform:translate3d(8px,0,0)}}@-webkit-keyframes glow{0%,100%{box-shadow:0 0 3px red}50%{box-shadow:0 0 30px red}}@keyframes glow{0%,100%{box-shadow:0 0 3px red}50%{box-shadow:0 0 30px red}}.jconfirm{-webkit-perspective:400px;perspective:400px}.jconfirm .jconfirm-box{opacity:1;-webkit-transition-property:all;transition-property:all}.jconfirm .jconfirm-box.jconfirm-animation-top,.jconfirm .jconfirm-box.jconfirm-animation-left,.jconfirm .jconfirm-box.jconfirm-animation-right,.jconfirm .jconfirm-box.jconfirm-animation-bottom,.jconfirm .jconfirm-box.jconfirm-animation-opacity,.jconfirm .jconfirm-box.jconfirm-animation-zoom,.jconfirm .jconfirm-box.jconfirm-animation-scale,.jconfirm .jconfirm-box.jconfirm-animation-none,.jconfirm .jconfirm-box.jconfirm-animation-rotate,.jconfirm .jconfirm-box.jconfirm-animation-rotatex,.jconfirm .jconfirm-box.jconfirm-animation-rotatey,.jconfirm .jconfirm-box.jconfirm-animation-scaley,.jconfirm .jconfirm-box.jconfirm-animation-scalex{opacity:0}.jconfirm .jconfirm-box.jconfirm-animation-rotate{-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.jconfirm .jconfirm-box.jconfirm-animation-rotatex{-webkit-transform:rotateX(90deg);transform:rotateX(90deg);-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center}.jconfirm .jconfirm-box.jconfirm-animation-rotatexr{-webkit-transform:rotateX(-90deg);transform:rotateX(-90deg);-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center}.jconfirm .jconfirm-box.jconfirm-animation-rotatey{-webkit-transform:rotatey(90deg);-ms-transform:rotatey(90deg);transform:rotatey(90deg);-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center}.jconfirm .jconfirm-box.jconfirm-animation-rotateyr{-webkit-transform:rotatey(-90deg);-ms-transform:rotatey(-90deg);transform:rotatey(-90deg);-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center}.jconfirm .jconfirm-box.jconfirm-animation-scaley{-webkit-transform:scaley(1.5);-ms-transform:scaley(1.5);transform:scaley(1.5);-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center}.jconfirm .jconfirm-box.jconfirm-animation-scalex{-webkit-transform:scalex(1.5);-ms-transform:scalex(1.5);transform:scalex(1.5);-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center}.jconfirm .jconfirm-box.jconfirm-animation-top{-webkit-transform:translate(0px,-100px);-ms-transform:translate(0px,-100px);transform:translate(0px,-100px)}.jconfirm .jconfirm-box.jconfirm-animation-left{-webkit-transform:translate(-100px,0px);-ms-transform:translate(-100px,0px);transform:translate(-100px,0px)}.jconfirm .jconfirm-box.jconfirm-animation-right{-webkit-transform:translate(100px,0px);-ms-transform:translate(100px,0px);transform:translate(100px,0px)}.jconfirm .jconfirm-box.jconfirm-animation-bottom{-webkit-transform:translate(0px,100px);-ms-transform:translate(0px,100px);transform:translate(0px,100px)}.jconfirm .jconfirm-box.jconfirm-animation-zoom{-webkit-transform:scale(1.2);-ms-transform:scale(1.2);transform:scale(1.2)}.jconfirm .jconfirm-box.jconfirm-animation-scale{-webkit-transform:scale(0.5);-ms-transform:scale(0.5);transform:scale(0.5)}.jconfirm .jconfirm-box.jconfirm-animation-none{visibility:hidden}.jconfirm.jconfirm-supervan .jconfirm-bg{background-color:rgba(54,70,93,0.95)}.jconfirm.jconfirm-supervan .jconfirm-box{background-color:transparent}.jconfirm.jconfirm-supervan .jconfirm-box.jconfirm-type-blue{border:0}.jconfirm.jconfirm-supervan .jconfirm-box.jconfirm-type-green{border:0}.jconfirm.jconfirm-supervan .jconfirm-box.jconfirm-type-red{border:0}.jconfirm.jconfirm-supervan .jconfirm-box.jconfirm-type-orange{border:0}.jconfirm.jconfirm-supervan .jconfirm-box.jconfirm-type-purple{border:0}.jconfirm.jconfirm-supervan .jconfirm-box.jconfirm-type-dark{border:0}.jconfirm.jconfirm-supervan .jconfirm-box div.jconfirm-closeIcon{color:white}.jconfirm.jconfirm-supervan .jconfirm-box div.jconfirm-title-c{text-align:center;color:white;font-size:28px;font-weight:normal}.jconfirm.jconfirm-supervan .jconfirm-box div.jconfirm-title-c>*{padding-bottom:25px}.jconfirm.jconfirm-supervan .jconfirm-box div.jconfirm-title-c .jconfirm-icon-c{margin-right:8px;margin-left:0}.jconfirm.jconfirm-supervan .jconfirm-box div.jconfirm-content-pane{margin-bottom:25px}.jconfirm.jconfirm-supervan .jconfirm-box div.jconfirm-content{text-align:center;color:white}.jconfirm.jconfirm-supervan .jconfirm-box .jconfirm-buttons{text-align:center}.jconfirm.jconfirm-supervan .jconfirm-box .jconfirm-buttons button{font-size:16px;border-radius:2px;background:#303f53;text-shadow:none;border:0;color:white;padding:10px;min-width:100px}.jconfirm.jconfirm-supervan.jconfirm-rtl .jconfirm-box div.jconfirm-title-c .jconfirm-icon-c{margin-left:8px;margin-right:0}.jconfirm.jconfirm-material .jconfirm-bg{background-color:rgba(0,0,0,0.67)}.jconfirm.jconfirm-material .jconfirm-box{background-color:white;box-shadow:0 7px 8px -4px rgba(0,0,0,0.2),0 13px 19px 2px rgba(0,0,0,0.14),0 5px 24px 4px rgba(0,0,0,0.12);padding:30px 25px 10px 25px}.jconfirm.jconfirm-material .jconfirm-box .jconfirm-title-c .jconfirm-icon-c{margin-right:8px;margin-left:0}.jconfirm.jconfirm-material .jconfirm-box div.jconfirm-closeIcon{color:rgba(0,0,0,0.87)}.jconfirm.jconfirm-material .jconfirm-box div.jconfirm-title-c{color:rgba(0,0,0,0.87);font-size:22px;font-weight:bold}.jconfirm.jconfirm-material .jconfirm-box div.jconfirm-content{color:rgba(0,0,0,0.87)}.jconfirm.jconfirm-material .jconfirm-box .jconfirm-buttons{text-align:right}.jconfirm.jconfirm-material .jconfirm-box .jconfirm-buttons button{text-transform:uppercase;font-weight:500}.jconfirm.jconfirm-material.jconfirm-rtl .jconfirm-title-c .jconfirm-icon-c{margin-left:8px;margin-right:0}.jconfirm.jconfirm-bootstrap .jconfirm-bg{background-color:rgba(0,0,0,0.21)}.jconfirm.jconfirm-bootstrap .jconfirm-box{background-color:white;box-shadow:0 3px 8px 0 rgba(0,0,0,0.2);border:solid 1px rgba(0,0,0,0.4);padding:15px 0 0}.jconfirm.jconfirm-bootstrap .jconfirm-box .jconfirm-title-c .jconfirm-icon-c{margin-right:8px;margin-left:0}.jconfirm.jconfirm-bootstrap .jconfirm-box div.jconfirm-closeIcon{color:rgba(0,0,0,0.87)}.jconfirm.jconfirm-bootstrap .jconfirm-box div.jconfirm-title-c{color:rgba(0,0,0,0.87);font-size:22px;font-weight:bold;padding-left:15px;padding-right:15px}.jconfirm.jconfirm-bootstrap .jconfirm-box div.jconfirm-content{color:rgba(0,0,0,0.87);padding:0 15px}.jconfirm.jconfirm-bootstrap .jconfirm-box .jconfirm-buttons{text-align:right;padding:10px;margin:-5px 0 0;border-top:solid 1px #ddd;overflow:hidden;border-radius:0 0 4px 4px}.jconfirm.jconfirm-bootstrap .jconfirm-box .jconfirm-buttons button{font-weight:500}.jconfirm.jconfirm-bootstrap.jconfirm-rtl .jconfirm-title-c .jconfirm-icon-c{margin-left:8px;margin-right:0}.jconfirm.jconfirm-modern .jconfirm-bg{background-color:slategray;opacity:.6}.jconfirm.jconfirm-modern .jconfirm-box{background-color:white;box-shadow:0 7px 8px -4px rgba(0,0,0,0.2),0 13px 19px 2px rgba(0,0,0,0.14),0 5px 24px 4px rgba(0,0,0,0.12);padding:30px 30px 15px}.jconfirm.jconfirm-modern .jconfirm-box div.jconfirm-closeIcon{color:rgba(0,0,0,0.87);top:15px;right:15px}.jconfirm.jconfirm-modern .jconfirm-box div.jconfirm-title-c{color:rgba(0,0,0,0.87);font-size:24px;font-weight:bold;text-align:center;margin-bottom:10px}.jconfirm.jconfirm-modern .jconfirm-box div.jconfirm-title-c .jconfirm-icon-c{-webkit-transition:-webkit-transform .5s;transition:transform .5s;-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);display:block;margin-right:0;margin-left:0;margin-bottom:10px;font-size:69px;color:#aaa}.jconfirm.jconfirm-modern .jconfirm-box div.jconfirm-content{text-align:center;font-size:15px;color:#777;margin-bottom:25px}.jconfirm.jconfirm-modern .jconfirm-box .jconfirm-buttons{text-align:center}.jconfirm.jconfirm-modern .jconfirm-box .jconfirm-buttons button{font-weight:bold;text-transform:uppercase;-webkit-transition:background .1s;transition:background .1s;padding:10px 20px}.jconfirm.jconfirm-modern .jconfirm-box .jconfirm-buttons button+button{margin-left:4px}.jconfirm.jconfirm-modern.jconfirm-open .jconfirm-box .jconfirm-title-c .jconfirm-icon-c{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)} \ No newline at end of file diff --git a/app/views/crm/dining_queues/assign.html.erb b/app/views/crm/dining_queues/assign.html.erb index 94fdc339..9310844b 100644 --- a/app/views/crm/dining_queues/assign.html.erb +++ b/app/views/crm/dining_queues/assign.html.erb @@ -41,8 +41,8 @@
      - - + diff --git a/db/migrate/20170403140820_create_order_items.rb b/db/migrate/20170403140820_create_order_items.rb index d8c858bd..ca1166dc 100644 --- a/db/migrate/20170403140820_create_order_items.rb +++ b/db/migrate/20170403140820_create_order_items.rb @@ -7,7 +7,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1] t.string :item_order_by #person who order this t.string :item_code, :null => false t.string :item_name, :null => false - t.integer :account, :limit => 8, :null => false, :default => 1 + t.integer :account_id, :limit => 8, :null => false, :default => 1 t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :price, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.string :remark diff --git a/db/migrate/20170403161857_create_sale_items.rb b/db/migrate/20170403161857_create_sale_items.rb index 18c1a876..48b1363e 100644 --- a/db/migrate/20170403161857_create_sale_items.rb +++ b/db/migrate/20170403161857_create_sale_items.rb @@ -5,7 +5,7 @@ class CreateSaleItems < ActiveRecord::Migration[5.1] t.string :sale_id, foreign_key: true, :limit => 16 t.string :product_code, :null => false t.string :product_name, :null => false - t.integer :account, :limit => 8, :null => false, :default => 1 + t.integer :account_id, :limit => 8, :null => false, :default => 1 t.string :remark t.decimal :qty, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :unit_price, :precision => 10, :scale => 2, :null => false, :default => 0.00 From 168c571a23a78d417a69f42cd175050a84fa3c00 Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 22 Jun 2017 05:24:31 +0630 Subject: [PATCH 049/128] multiple invoice --- app/controllers/origami/home_controller.rb | 11 ++++---- app/controllers/origami/orders_controller.rb | 2 +- app/controllers/origami/rooms_controller.rb | 2 +- app/controllers/origami/sales_controller.rb | 2 +- app/models/booking.rb | 26 +++++++++---------- app/views/origami/home/show.html.erb | 23 +++++++++++++--- .../origami/movetable/move_dining.html.erb | 14 +++++++--- 7 files changed, 53 insertions(+), 27 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 84a46622..dc61f7fb 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -4,7 +4,7 @@ class Origami::HomeController < BaseOrigamiController def index @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.complete_sale @orders = Order.all.order('date desc') end @@ -12,15 +12,15 @@ class Origami::HomeController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.complete_sale @orders = Order.all.order('date desc') @status_order = "" - @order_items = Array.new + @status_sale = "" + @sale_array = Array.new @dining.bookings.each do |booking| - if booking.sale_id.nil? - booking.booking_orders.each do |booking_order| + @order_items = Array.new order = Order.find(booking_order.order_id) @obj_order = order @date = order.created_at @@ -32,6 +32,7 @@ class Origami::HomeController < BaseOrigamiController else sale = Sale.find(booking.sale_id) if sale.sale_status != "completed" + @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' end diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index cc5fac3f..e5eb2808 100644 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.complete_sale @orders = Order.all.order('status desc') @order = Order.find(params[:order_id]) sale_order = SaleOrder.find_by_order_id(@order.order_id) diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 1ac7f41a..56030d4f 100644 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.complete_sale @orders = Order.all.order('date desc') @room = DiningFacility.find(params[:room_id]) @room.bookings.each do |booking| diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index e9eb2edc..b5200114 100644 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.all + @complete = Sale.complete_sale @orders = Order.all.order('date desc') @sale = Sale.find(params[:sale_id]) end diff --git a/app/models/booking.rb b/app/models/booking.rb index 2b3905ae..4aa177fc 100644 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -15,19 +15,19 @@ class Booking < ApplicationRecord booking.dining_facility_id = newd booking.save end - table = DiningFacility.find(newd) - if table - booking = table.get_current_booking - if booking - newtablebookingID= booking.booking_id - booking_arr.each do |booking| - booking.booking_orders.each do |booking_order| - booking_order.booking_id = newtablebookingID - booking_order.save - end - end - end - end + # table = DiningFacility.find(newd) + # if table + # booking = table.get_current_booking + # if booking + # newtablebookingID= booking.booking_id + # booking_arr.each do |booking| + # booking.booking_orders.each do |booking_order| + # booking_order.booking_id = newtablebookingID + # booking_order.save + # end + # end + # end + # end new_dining = DiningFacility.find(newd) new_dining.make_occupied old_dining = DiningFacility.find(old) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 9ce6bdfc..d1629a04 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -97,7 +97,7 @@
      - <% if @status_order == 'order' %> + <% if @status_order == 'order' && @status_sale != 'sale' %>
      ORDER DETAILS
      <% elsif @status_sale == 'sale' %>
      INVOICE DETAILS
      @@ -150,7 +150,7 @@ end end - if @status_order == 'order' + if @status_order == 'order' && @status_sale != 'sale' unless @order_items.nil? @order_items.each do |order_item | sub_total = sub_total + order_item.price @@ -217,8 +217,25 @@ <% + else + @sale_array.each do |sale| + if @sale_array.size > 1 + %> + Pending New Invoice + <% + unless sale.receipt_no == @obj_sale.receipt_no + %> + + + + +
      <%= sale.receipt_no %>
      + <% + end + end + end + end end - end %>
      diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index 2e03aaa2..7874f42b 100644 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -99,6 +99,7 @@ + <% + count = 0 sub_total = 0 if @status_sale == "sale" @obj_sale.sale_items.each do |sale_item| sub_total = sub_total + sale_item.price + count += 1 %> <% unless sale_item.price <= 0 %> + @@ -122,14 +126,15 @@ end end end - - if @status_order == 'order' + count = 0 + if @status_order == 'order' && @status_sale != 'sale' unless @order_items.nil? @order_items.each do |order_item | sub_total = sub_total + order_item.price - + count += 1 unless order_item.price <= 0 %> + @@ -150,10 +155,13 @@ Pending New Order
      # Items QTY Price @@ -106,14 +107,17 @@
      <%= count %> <%= sale_item.product_name %> <%= sale_item.qty %> <%= sale_item.price %>
      <%= count %> <%= order_item.item_name %> <%= order_item.qty %> <%= order_item.qty*order_item.price %>
      <% + count = 0 @order_items.each do |order_item | + count += 1 %> + From 0ff10f2f32684af9bf2951a5aafa86bf83a687c1 Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 22 Jun 2017 05:51:42 +0630 Subject: [PATCH 050/128] move multiple order and sales --- app/controllers/origami/home_controller.rb | 3 +- .../origami/movetable_controller.rb | 9 ++-- app/models/booking.rb | 13 ------ app/views/origami/home/show.html.erb | 23 +++++++---- .../origami/movetable/move_dining.html.erb | 41 ++++++++++++++----- 5 files changed, 53 insertions(+), 36 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index dc61f7fb..4c35a918 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -19,8 +19,9 @@ class Origami::HomeController < BaseOrigamiController @sale_array = Array.new @dining.bookings.each do |booking| if booking.sale_id.nil? + @order_items = Array.new booking.booking_orders.each do |booking_order| - @order_items = Array.new + order = Order.find(booking_order.order_id) @obj_order = order @date = order.created_at diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index c5b2b2fc..cc6281ce 100644 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -5,14 +5,14 @@ class Origami::MovetableController < BaseOrigamiController @rooms = Room.all.active.order('status desc') @complete = Sale.all @orders = Order.all.order('date desc') + @dining = DiningFacility.find(params[:dining_id]) @status_order = "" - @dining = DiningFacility.find(params[:dining_id]) - @order_items = Array.new + @status_sale = "" + @sale_array = Array.new @dining.bookings.each do |booking| - if booking.sale_id.nil? - + @order_items = Array.new booking.booking_orders.each do |booking_order| order = Order.find(booking_order.order_id) @@ -26,6 +26,7 @@ class Origami::MovetableController < BaseOrigamiController else sale = Sale.find(booking.sale_id) if sale.sale_status != "completed" + @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' end diff --git a/app/models/booking.rb b/app/models/booking.rb index 4aa177fc..79fbad4a 100644 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -15,19 +15,6 @@ class Booking < ApplicationRecord booking.dining_facility_id = newd booking.save end - # table = DiningFacility.find(newd) - # if table - # booking = table.get_current_booking - # if booking - # newtablebookingID= booking.booking_id - # booking_arr.each do |booking| - # booking.booking_orders.each do |booking_order| - # booking_order.booking_id = newtablebookingID - # booking_order.save - # end - # end - # end - # end new_dining = DiningFacility.find(newd) new_dining.make_occupied old_dining = DiningFacility.find(old) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index d1629a04..b6398686 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -108,7 +108,7 @@

      Receipt No: <% if @status_sale == 'sale' %> - <%= @obj_sale.receipt_no rescue '' %> + <%= @sale_array[0].receipt_no rescue '' %> <% end %>

      @@ -126,6 +126,7 @@
      <%= count %> <%= order_item.item_name %> <%= order_item.qty %> <%= order_item.qty*order_item.price %>
      + <% + count = 0 sub_total = 0 if @status_sale == "sale" - @obj_sale.sale_items.each do |sale_item| + puts @sale_array[0] + @sale_array[0].sale_items.each do |sale_item| + count += 1 sub_total = sub_total + sale_item.price %> - + <% unless sale_item.price <= 0 %> + @@ -152,11 +157,16 @@ if @status_order == 'order' && @status_sale != 'sale' unless @order_items.nil? + count = 0 @order_items.each do |order_item | + puts @order_items.size + puts "view" + count += 1 sub_total = sub_total + order_item.price unless order_item.price <= 0 %> + @@ -220,14 +230,13 @@ else @sale_array.each do |sale| if @sale_array.size > 1 + unless sale.receipt_no == @sale_array[0].receipt_no %> Pending New Invoice - <% - unless sale.receipt_no == @obj_sale.receipt_no - %>
      # Items QTY Price @@ -133,14 +134,18 @@
      <%= count %> <%= sale_item.product_name %> <%= sale_item.qty %> <%= sale_item.price %>
      <%= count %> <%= order_item.item_name %> <%= order_item.qty %> <%= order_item.qty*order_item.price %>
      - + +
      <%= sale.receipt_no %>Receipt No - <%= sale.receipt_no %>
      <% diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index 7874f42b..83419ca0 100644 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -81,7 +81,7 @@

      Receipt No: <% if @status_sale == 'sale' %> - <%= @obj_sale.receipt_no rescue '' %> + <%= @sale_array[0].receipt_no rescue '' %> <% end %>

      @@ -110,11 +110,12 @@ count = 0 sub_total = 0 if @status_sale == "sale" - @obj_sale.sale_items.each do |sale_item| + puts @sale_array[0] + @sale_array[0].sale_items.each do |sale_item| + count += 1 sub_total = sub_total + sale_item.price - count += 1 %> - + <% unless sale_item.price <= 0 %> <%= count %> @@ -126,12 +127,16 @@ end end end - count = 0 - if @status_order == 'order' && @status_sale != 'sale' + + if @status_order == 'order' && @status_sale != 'sale' unless @order_items.nil? + count = 0 @order_items.each do |order_item | + puts @order_items.size + puts "view" + count += 1 sub_total = sub_total + order_item.price - count += 1 + unless order_item.price <= 0 %> <%= count %> @@ -155,13 +160,10 @@ Pending New Order <% - count = 0 @order_items.each do |order_item | - count += 1 %> - @@ -171,9 +173,26 @@ end %>
      <%= count %> <%= order_item.item_name %> <%= order_item.qty %> <%= order_item.qty*order_item.price %>
      + <% + else + @sale_array.each do |sale| + if @sale_array.size > 1 + unless sale.receipt_no == @sale_array[0].receipt_no + %> + Pending New Invoice + + + + + +
      Receipt No - <%= sale.receipt_no %>
      + <% + end + end + end + end end - end %>
      From bded56a696156866b615a9bd9e212cccf7d249d0 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 22 Jun 2017 10:11:50 +0630 Subject: [PATCH 051/128] customer seed updated --- Gemfile | 2 +- Gemfile.lock | 2 -- db/seeds.rb | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 227cfa72..22275707 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -gem 'pg' +# gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index e4b905ea..5c0f8a10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,6 @@ GEM nokogiri (1.8.0) mini_portile2 (~> 2.2.0) pdf-core (0.7.0) - pg (0.21.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -261,7 +260,6 @@ DEPENDENCIES kaminari (~> 1.0.1) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) diff --git a/db/seeds.rb b/db/seeds.rb index a646bdad..c3d9a354 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -83,8 +83,8 @@ void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manag {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"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000", card_no:'000' }) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111", card_no:'111' }) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 54526230aa8f2cec287380e1fdee779f7be7a6bb Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 22 Jun 2017 10:25:40 +0630 Subject: [PATCH 052/128] update customerbind in origami --- .../origami/customers_controller.rb | 19 +++++++++++++++++++ config/routes.rb | 2 +- db/seeds.rb | 4 ++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 601055e5..878571f1 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -39,5 +39,24 @@ class Origami::CustomersController < BaseOrigamiController 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 + end diff --git a/config/routes.rb b/config/routes.rb index 7ec8b9e5..3b647fa9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,7 +112,7 @@ Rails.application.routes.draw do #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 + post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer"#update customer id in sale table end #--------- Waiter/Ordering Station ------------# diff --git a/db/seeds.rb b/db/seeds.rb index a646bdad..0e88e336 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -83,8 +83,8 @@ void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manag {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"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"000"}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From b13b0afa6c4ef7331ffd07f3c8be07f40671fbd5 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 22 Jun 2017 11:31:05 +0630 Subject: [PATCH 053/128] discuont updated for show --- app/controllers/origami/discounts_controller.rb | 10 ++++------ app/views/origami/home/show.html.erb | 11 +++++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index a195bb6a..6c0a4c8d 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -20,9 +20,9 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) sale.total_discount = overall_discount.to_f - sale.total_amount = sub_total - sale.grand_total = (sub_total - overall_discount.to_f) + sale.total_tax; - + sale.total_amount = sub_total.to_f + sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax; + sale.save if discount_items.length > 0 #save sale item for discount discount_items.each do |di| @@ -42,9 +42,7 @@ class Origami::DiscountsController < BaseOrigamiController sale_item.price = di["price"] sale_item.save - end - - sale.save + end end end end diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 22e35765..139697e3 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -143,7 +143,10 @@ sub_total = sub_total + sale_item.price %> - <% unless sale_item.price <= 0 %> + <% + # Can't check for discount + unless sale_item.price == 0 + %> <%= count %> <%= sale_item.product_name %> @@ -151,7 +154,7 @@ <%= sale_item.price %> <% - end + end end end @@ -164,7 +167,7 @@ count += 1 sub_total = sub_total + order_item.price - unless order_item.price <= 0 %> + unless order_item.price == 0 %> <%= count %> <%= order_item.item_name %> @@ -188,7 +191,7 @@ Discount: - (<%= @obj_order.total_discount rescue 0%>) + (<%= @obj_sale.total_discount rescue 0%>) <% if @status_sale == "sale" %> From 187caa5253c63b5a2f02e6a422eee111d46a58df Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 22 Jun 2017 11:58:16 +0630 Subject: [PATCH 054/128] update customre --- app/assets/stylesheets/origami.scss | 6 ++++++ app/controllers/origami/customers_controller.rb | 13 +++++++++---- app/models/customer.rb | 2 +- app/views/origami/customers/index.html.erb | 2 +- app/views/origami/home/show.html.erb | 2 +- ...ers.rb => 20170622050926_create_customers.rb} | 16 +++++++--------- db/seeds.rb | 2 +- 7 files changed, 26 insertions(+), 17 deletions(-) rename db/migrate/{20170621085729_create_customers.rb => 20170622050926_create_customers.rb} (81%) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 6b350bf1..30e3781d 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -179,3 +179,9 @@ select.form-control { tr.discount-item-row:hover { background-color: #e3e3e3 !important; } + +/* Jquery Confirm */ + +.jconfirm-box-container{ + margin-left:-40px !important +} \ No newline at end of file diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 878571f1..373dc2f5 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -44,17 +44,22 @@ class Origami::CustomersController < BaseOrigamiController id = params[:sale_id][0,3] if(id == "SAL") sale = Sale.find(params[:sale_id]) + status = sale.update_attributes(customer_id: params[:customer_id]) else - sale = Order.find(params[:sale_id]) - end + @booking = BookingOrder.find_by_order_id(params[:sale_id]) + @orders = BookingOrder.where("booking_id = ? ", @booking.booking_id) - status = sale.update_attributes(customer_id: params[:customer_id]) + @orders.each do |bo| + order = Order.find(bo.order_id) + status = order.update_attributes(customer_id: params[:customer_id]) + end + + end if status == true render json: JSON.generate({:status => true}) else render json: JSON.generate({:status => false, :error_message => "Record not found"}) - end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 4e25c9bc..5debec38 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,7 +6,7 @@ class Customer < ApplicationRecord has_many :orders has_many :sales - validates_presence_of :name, :contact_no, :email,:company,:card_no + validates_presence_of :name, :contact_no, :email,:card_no validates :contact_no, uniqueness: true validates :email, uniqueness: true validates :card_no, uniqueness: true diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 3b192319..5539b42b 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -246,7 +246,7 @@ $('#update_customer').removeAttr('disabled').val(''); $('#update_customer').attr('value', 'Update'); - $('#submit_customer').attr('disabled','disabled'); + // $('#submit_customer').attr('disabled','disabled'); $("#new_customer").attr('class', 'simple_form edit_customer'); var id = "edit_customer_"+$('#customer_id').val(); diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 22e35765..2719a758 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -298,7 +298,7 @@ $(document).ready(function(){ // bind customer to order or sale $("#customer").on('click', function(){ var sale = $('#sale_id').val(); - if (sale!="") { + if (sale) { var sale_id = sale }else{ var sale_id = $('#save_order_id').attr('data-order'); diff --git a/db/migrate/20170621085729_create_customers.rb b/db/migrate/20170622050926_create_customers.rb similarity index 81% rename from db/migrate/20170621085729_create_customers.rb rename to db/migrate/20170622050926_create_customers.rb index 57553010..07ec136f 100644 --- a/db/migrate/20170621085729_create_customers.rb +++ b/db/migrate/20170622050926_create_customers.rb @@ -1,22 +1,20 @@ class CreateCustomers < ActiveRecord::Migration[5.1] def change - create_table :customers, :id => false 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, :unique => true t.string :email - t.date :date_of_birth - t.string :membership_id - t.string :membership_type - t.string :membership_authentication_code - t.string :salution + t.string :contact_no, :unique => true + t.date :date_of_birth + t.string :salutation t.string :gender t.string :nrc_no t.string :address t.string :card_no, :unique => true - - t.timestamps + t.string :membership_id + t.string :membership_type + t.string :membership_authentication_code end end end diff --git a/db/seeds.rb b/db/seeds.rb index 0e88e336..21268860 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -84,7 +84,7 @@ void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manag #WALK CUSTOMER - Default CUSTOMER (take key 1) customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"000"}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111"}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From f8cab803f84c0a3f1fead6b1ae7aa6e4e76dac59 Mon Sep 17 00:00:00 2001 From: Phyo Date: Thu, 22 Jun 2017 13:31:54 +0630 Subject: [PATCH 055/128] Redeem amount bug fic --- .../origami/redeem_payments_controller.rb | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 792cb7a4..802ba51b 100644 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -6,8 +6,24 @@ class Origami::RedeemPaymentsController < BaseOrigamiController sale_data = Sale.find_by_sale_id(@sale_id) # limit redeem_amount - rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) - nonrebate_prices = sale_data.total_amount - rebate_prices + # rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) + # nonrebate_prices = sale_data.total_amount - rebate_prices + # @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 + # non_rebate_exceed = others - (nonrebate_prices + sale_data.total_tax) + # if non_rebate_exceed < 0 + # @redeem_prices = rebate_prices - @payparcount + # else + # @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed + # end + @payparcount = 0 others = 0 sale_data.sale_payments.each do |sale_payment| @@ -17,12 +33,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController others = others + sale_payment.payment_amount end end - non_rebate_exceed = others - (nonrebate_prices + sale_data.total_tax) - if non_rebate_exceed < 0 - @redeem_prices = rebate_prices - @payparcount - else - @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed - end + @redeem_prices = sale_data.grand_total - @payparcount -others + if sale_data if sale_data.customer_id From 3d838bc989b662793a817c02a99b645f77186e67 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 22 Jun 2017 13:35:20 +0630 Subject: [PATCH 056/128] update report and customer --- app/controllers/crm/customers_controller.rb | 4 +- .../reports/daily_sale_controller.rb | 4 + .../reports/receipt_no_controller.rb | 4 + .../reports/sale_item_controller.rb | 5 + app/views/api/customers/index.json.jbuilder | 2 +- app/views/api/customers/show.json.jbuilder | 2 +- .../crm/customers/_crm_customer.json.jbuilder | 2 +- app/views/crm/customers/index.html.erb | 8 +- app/views/crm/customers/show.json.jbuilder | 3 +- app/views/origami/customers/index.html.erb | 8 +- app/views/reports/sale_item/index.xls.erb | 246 ++++++++++-------- config/initializers/mime_types.rb | 1 + 12 files changed, 161 insertions(+), 128 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 646f6475..ce585686 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -46,7 +46,7 @@ class Crm::CustomersController < BaseCrmController end #get customer amount - @customer = Customer.find(params[:id]) + @customer = Customer.find(params[:id]) @response = Customer.get_membership_transactions(@customer) #end customer amount @@ -201,6 +201,6 @@ end def customer_params params.require(:customer).permit(:name, :company, :contact_no, :email, - :date_of_birth,:salution,:gender,:nrc_no,:address,:card_no) + :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no) end end diff --git a/app/controllers/reports/daily_sale_controller.rb b/app/controllers/reports/daily_sale_controller.rb index 6e1eb85a..ba453f55 100644 --- a/app/controllers/reports/daily_sale_controller.rb +++ b/app/controllers/reports/daily_sale_controller.rb @@ -4,6 +4,10 @@ class Reports::DailySaleController < BaseReportController from, to ,report_type = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) @tax = SaleTax.get_tax(from,to) + respond_to do |format| + format.html + format.xls + end end def show diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 86c8d981..d85c7d57 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -8,6 +8,10 @@ class Reports::ReceiptNoController < BaseReportController puts to @sale_data = Sale.get_receipt_no_list(from,to) @sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50) + respond_to do |format| + format.html + format.xls + end end def show diff --git a/app/controllers/reports/sale_item_controller.rb b/app/controllers/reports/sale_item_controller.rb index 1da31aff..eb7d3b86 100644 --- a/app/controllers/reports/sale_item_controller.rb +++ b/app/controllers/reports/sale_item_controller.rb @@ -5,6 +5,11 @@ class Reports::SaleItemController < BaseReportController from, to, report_type = get_date_range_from_params @sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type) + + respond_to do |format| + format.html + format.xls + end end def show diff --git a/app/views/api/customers/index.json.jbuilder b/app/views/api/customers/index.json.jbuilder index 2c3c07a7..0d1d37e7 100644 --- a/app/views/api/customers/index.json.jbuilder +++ b/app/views/api/customers/index.json.jbuilder @@ -1,3 +1,3 @@ -json.array! @customers, :id, :name, :company, :contact_no,:salution, +json.array! @customers, :id, :name, :company, :contact_no,:salutation, :gender,:nrc_no,:address,:card_no, :membership_type, :membership_id, :created_at diff --git a/app/views/api/customers/show.json.jbuilder b/app/views/api/customers/show.json.jbuilder index db56961b..acf54ac1 100644 --- a/app/views/api/customers/show.json.jbuilder +++ b/app/views/api/customers/show.json.jbuilder @@ -1,4 +1,4 @@ -json.extract! @customer, :id, :name, :company, :contact_no,:salution, +json.extract! @customer, :id, :name, :company, :contact_no,:salutation, :gender,:nrc_no,:address,:card_no, :membership_type, :membership_id, :created_at json.invoices do diff --git a/app/views/crm/customers/_crm_customer.json.jbuilder b/app/views/crm/customers/_crm_customer.json.jbuilder index c80c1716..1b1b237e 100644 --- a/app/views/crm/customers/_crm_customer.json.jbuilder +++ b/app/views/crm/customers/_crm_customer.json.jbuilder @@ -1,2 +1,2 @@ -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.extract! crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, :created_at, :updated_at,:salutation, :gender,:nrc_no,:address,:card_no json.url crm_customer_url(crm_customer, format: :json) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index e7b47460..3678008e 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -120,7 +120,7 @@ $(document).on('click',".customer_tr",function(){ $('#customer_company').val(data.company); $('#customer_contact_no').val(data.contact_no); $('#customer_email').val(data.email); - $('#customer_salution').val(data.salution); + $('#customer_salutation').val(data.salutation); $('#customer_nrc_no').val(data.nrc_no); $('#customer_card_no').val(data.card_no); $('#customer_address').val(data.address); @@ -133,11 +133,11 @@ $(document).on('click',".customer_tr",function(){ $('.female').prop( "checked", true ) } - if(data.salution == 'Mr') { + if(data.salutation == 'Mr') { $('.mr').prop( "checked", true ) - }else if(data.salution == 'Miss') { + }else if(data.salutation == 'Miss') { $('.miss').prop( "checked", true ) - }else if(data.salution == 'Mrs'){ + }else if(data.salutation == 'Mrs'){ $('.mrs').prop( "checked", true ) }else{ $('.mdm').prop( "checked", true ) diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder index d41edb5d..86901801 100644 --- a/app/views/crm/customers/show.json.jbuilder +++ b/app/views/crm/customers/show.json.jbuilder @@ -1,5 +1,4 @@ json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, - :created_at, :updated_at, - :salution, :gender,:nrc_no,:address,:card_no + :salutation, :gender,:nrc_no,:address,:card_no json.url crm_customer_url(@crm_customer, format: :json) diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 5539b42b..8a811073 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -225,7 +225,7 @@ $('.select > option[value="'+data.membership_id+'"]').attr('selected','selected'); $('.membership_authentication_code').val(data.membership_authentication_code); - $('#customer_salution').val(data.salution); + $('#customer_salutation').val(data.salutation); $('#customer_nrc_no').val(data.nrc_no); if (data.gender == 'Male') { @@ -234,11 +234,11 @@ $('.female').prop( "checked", true ) } - if (data.salution == 'Mr') { + if (data.salutation == 'Mr') { $('.mr').prop( "checked", true ) - } else if(data.salution == 'Miss') { + } else if(data.salutation == 'Miss') { $('.miss').prop( "checked", true ) - }else if(data.salution == 'Mrs'){ + }else if(data.salutation == 'Mrs'){ $('.mrs').prop( "checked", true ) }else{ $('.mdm').prop( "checked", true ) diff --git a/app/views/reports/sale_item/index.xls.erb b/app/views/reports/sale_item/index.xls.erb index dfcc18d4..2807ec3f 100644 --- a/app/views/reports/sale_item/index.xls.erb +++ b/app/views/reports/sale_item/index.xls.erb @@ -1,116 +1,136 @@ -
      -
      - - - <% if params[:from]%> - - - - <% end %> - - - - - - - - - - - - - - - - - - - <% unless @sale_data.empty? %> - - - <% void = 0 %> - <% mpu = 0 %> - <% master = 0 %> - <% visa = 0 %> - <% jcb = 0 %> - <% paypar = 0 %> - <% cash = 0 %> - <% credit = 0 %> - <% foc = 0 %> - <% discount = 0 %> - <% total = 0 %> - <% grand_total = 0 %> - <% count = 1 %> <% rounding_adj = 0 %> - <% @sale_data.each do |sale| %> - <% void += sale[:void_amount] %> - <% mpu += sale[:mpu_amount] %> - <% master += sale[:master_amount] %> - <% visa += sale[:visa_amount] %> - <% jcb += sale[:jcb_amount] %> - <% paypar += sale[:paypar_amount] %> - <% cash += sale[:cash_amount] %> - <% credit += sale[:credit_amount] %> - <% foc += sale[:foc_amount] %> - <% discount += sale[:total_discount] %> - <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> - <% grand_total += sale[:grand_total].to_f %> - <% rounding_adj += sale[:rounding_adj].to_f %> - - - - - - - - - - - - - - - - - - <% count = count + 1 %> - <% end %> + + + + + + + +
      +<% unless @sale_data.blank? %> -
      - - - - - - - - - - - - - - +
      Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
      Sr.noDateDaily Void AmountDaily mpu SalesDaily master SalesDaily visa SalesDaily jcb SalesDaily paypar SalesDaily Cash SalesDaily Credit SalesDaily FOC Sales(Daily Discount)Grand Total +
      Rounding Adj.      		Rounding Adj.Grand Total
      <%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
      Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
      + - <% total_tax = 0 %> - <% unless @tax.empty? %> - <% @tax.each do |tax| %> - <% total_tax += tax.tax_amount.to_f %> - - - - - - - <% end %> - <% net = total - total_tax %> - - - - - - <% end %> - + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + + <% acc_arr = Array.new %> + <% cate_arr = Array.new %> + + <% sub_total = 0.0 %> + <% count = 0%> + <% total_price = 0.0 %> + <% cate_count = 0 %> + <% acc_count = 0%> + <% grand_total = 0%> + <% total_discount = 0.0 %> + + <% @sale_data.order("total_item desc").each do |sale| %> + + <% if !acc_arr.include?(sale.account_id) %> + + + + + + + <% acc_arr.push(sale.account_id) %> + + <% end %> + + + <% if !cate_arr.include?(sale.menu_category_id) %> + + <% cate_arr.push(sale.menu_category_id) %> + <% else %> + <% end %> -
      <%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
      Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
      From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
      Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
       Menu CategoryCodeProductTotal ItemUnit PriceRevenue
      <%= sale.account_name %> Total Price By <%= sale.account_name %> + <% @totalByAccount.each do |account, total| %> + <% if sale.account_id == account %> + <%= total %> + <% end %> + <% end %> +
       <%= sale.menu_category_name %> 
      -
      -
      \ No newline at end of file + <%= sale.code rescue '-' %> + <% if @item_table == 'sale' %> + <% if sale.item_remark == 'FOC' %> + <%= '[PROMO] '.to_s + sale.product_name.to_s rescue '-' %> + <% elsif sale.item_remark == 'FOC ITEM' %> + <%= '[DIS:QTY] '.to_s + sale.product_name.to_s rescue '-' %> + <% elsif sale.item_remark == 'DISCOUNT' %> + <%= '[DIS:TP] '.to_s + sale.product_name.to_s rescue '-' %> + <% else %> + <%= sale.product_name.to_s rescue '-' %> + <% end %> + <% if sale.item_remark == 'DISCOUNT' %> + - + - + <%= sale.total_price.abs rescue '-' %> + <% total_price += sale.total_price %> + <% else %> + <%= sale.total_item.abs rescue '-' %> + <%= sale.unit_price rescue '-' %> + <%= sale.grand_total.abs rescue '-' %> + <% end %> + <% else %> + <%= sale.product_name.to_s rescue '-' %> + <%= sale.total_item.abs rescue '-' %> + <%= sale.unit_price rescue '-' %> + <%= sale.grand_total.abs rescue '-' %> + <% end %> + + + + <% @menu_cate_count.each do |key,value| %> + <% if sale.menu_category_id == key %> + <% count = count + 1 %> + <% sub_total += sale.grand_total %> + <% if count == value %> + +   + Sub Total + <%= sub_total + total_price %> + + <% sub_total = 0.0%> + <% total_discount = total_discount + total_price %> + <% total_price = 0.0%> + <% count = 0%> + <% end %> + <% end %> + <% end %> + + <% grand_total += sale.grand_total%> + <% end %> + +   + Grand Total + <%= grand_total + total_discount %> + + + +<% end %> +
      + + \ No newline at end of file diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index dc189968..3859c754 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -2,3 +2,4 @@ # Add new mime types for use in respond_to blocks: # Mime::Type.register "text/richtext", :rtf +Mime::Type.register 'application/vnd.ms-excel', :xls From 0ea2b778d18314646fc4a3ba0b208cc7709a1e4c Mon Sep 17 00:00:00 2001 From: Nweni Date: Thu, 22 Jun 2017 14:26:23 +0630 Subject: [PATCH 057/128] multiple sale and order --- app/controllers/api/orders_controller.rb | 83 ++++++++----------- app/controllers/origami/home_controller.rb | 10 +-- app/controllers/origami/orders_controller.rb | 2 +- app/controllers/origami/rooms_controller.rb | 2 +- app/controllers/origami/sales_controller.rb | 36 +++++++- app/models/booking.rb | 1 + app/models/dining_facility.rb | 11 +++ app/models/sale_payment.rb | 2 + app/views/origami/home/show.html.erb | 41 ++++++--- .../origami/movetable/move_dining.html.erb | 2 +- app/views/origami/payments/show.html.erb | 14 +++- .../add_to_existing_invoice.json.jbuilder | 1 + config/routes.rb | 1 + 13 files changed, 134 insertions(+), 72 deletions(-) create mode 100644 app/views/origami/sales/add_to_existing_invoice.json.jbuilder diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index b42de7c5..1eba8c56 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -22,27 +22,19 @@ class Api::OrdersController < Api::ApiController if booking if booking.dining_facility_id.to_i == table_id.to_i - @booking = booking + if booking.booking_status == 'assign' + if booking.sale_id.nil? + @booking = booking + end + end else table = DiningFacility.find(table_id) - booking = table.get_current_booking - if booking - if booking.dining_facility_id.to_i == table_id.to_i - @booking = booking - end - end + @booking = table.get_booking end end else - puts "only table" table = DiningFacility.find(table_id) - booking = table.get_current_booking - puts booking - if booking - if booking.dining_facility_id.to_i == table_id.to_i - @booking = booking - end - end + @booking = table.get_booking end end @@ -73,54 +65,47 @@ class Api::OrdersController < Api::ApiController # check booking id is already completed. booking = Booking.find(params[:booking_id]) if booking - if booking.dining_facility_id.to_i == params[:table_id].to_i + if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved' 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 + check_order_with_booking(booking) else @order.new_booking = false @order.booking_id = params[:booking_id] - puts "booking sale is null" end else - # booking.table id not equal current table - table = DiningFacility.find(params[:table_id]) - if table - booking = table.get_current_booking - if booking - if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed" - @order.new_booking = true - else - @order.new_booking = false - @order.booking_id = booking.booking_id - end - end - end + check_order_with_table(params[:table_id]) end end #booking exists else - #no booking id - table = DiningFacility.find(params[:table_id]) - if table - booking = table.get_current_booking - if booking - if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed" - @order.new_booking = true - else - @order.new_booking = false - @order.booking_id = booking.booking_id - end - end + check_order_with_table(params[:table_id]) end - end @status, @booking = @order.generate end + def check_order_with_table(table_id) + table = DiningFacility.find(table_id) + if table + booking = table.get_current_booking + if booking + if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed" + @order.new_booking = true + else + @order.new_booking = false + @order.booking_id = booking.booking_id + end + end + end + end + + def check_order_with_booking(booking) + 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 + end # Description # This API - allow order to add new items to existing orders, does not allow you to remove confirm items # Update customer info, Guest Info diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 4c35a918..a8560eee 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -4,7 +4,7 @@ class Origami::HomeController < BaseOrigamiController def index @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.complete_sale + @complete = Sale.all @orders = Order.all.order('date desc') end @@ -12,13 +12,13 @@ class Origami::HomeController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.complete_sale + @complete = Sale.all @orders = Order.all.order('date desc') @status_order = "" @status_sale = "" @sale_array = Array.new - @dining.bookings.each do |booking| - if booking.sale_id.nil? + @dining.bookings.active.each do |booking| + if booking.sale_id.nil? && booking.booking_status != 'moved' @order_items = Array.new booking.booking_orders.each do |booking_order| @@ -42,7 +42,7 @@ class Origami::HomeController < BaseOrigamiController @obj_sale = sale end end - end + end end private diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index e5eb2808..cc5fac3f 100644 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.complete_sale + @complete = Sale.all @orders = Order.all.order('status desc') @order = Order.find(params[:order_id]) sale_order = SaleOrder.find_by_order_id(@order.order_id) diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 56030d4f..1ac7f41a 100644 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.complete_sale + @complete = Sale.all @orders = Order.all.order('date desc') @room = DiningFacility.find(params[:room_id]) @room.bookings.each do |booking| diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index b5200114..e272c1ee 100644 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -3,8 +3,42 @@ class Origami::SalesController < BaseOrigamiController def show @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - @complete = Sale.complete_sale + @complete = Sale.all @orders = Order.all.order('date desc') @sale = Sale.find(params[:sale_id]) end + + def add_to_existing_invoice + dining = params[:dining_id] + sale_id = params[:sale_id] + table = DiningFacility.find(dining) + table.bookings.each do |booking| + if booking.sale_id.nil? + booking.booking_orders.each do |booking_order| + booking.booking_status = 'moved' + order = Order.find(booking_order.order_id) + order.status = 'billed' + order.order_items.each do |item| + item.order_item_status = 'billed' + end + # create sale item + saleobj = Sale.find(sale_id) + order.order_items.each do |orer_item| + saleobj.add_item (orer_item) + end + saleobj.save + order.save + booking.save + end + existing_booking = Booking.find_by_sale_id(sale_id) + booking_order = BookingOrder.where('booking_id=?',booking) + booking_order.each do |bo| + bo.booking_id = existing_booking.booking_id + bo.save + end + end + end + end + + end diff --git a/app/models/booking.rb b/app/models/booking.rb index 79fbad4a..b7c6667a 100644 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -9,6 +9,7 @@ class Booking < ApplicationRecord belongs_to :sale, :optional => true has_many :booking_orders has_many :orders, :through => :booking_orders + scope :active, -> {where("booking_status != 'moved'")} def self.update_dining_facility(booking_arr, newd, old) booking_arr.each do |booking| diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index abf39d7a..0e10307b 100644 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -18,6 +18,17 @@ class DiningFacility < ApplicationRecord self.save end + def get_booking + booking = self.get_current_booking + if booking + if booking.dining_facility_id.to_i == self.id + if booking.booking_status == 'assign' + return booking + end + end + end + end + def get_current_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) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index e827113c..4974c856 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -244,9 +244,11 @@ class SalePayment < ApplicationRecord table = DiningFacility.find(booking.dining_facility_id) bookings = table.bookings bookings.each do |tablebooking| + if tablebooking.booking_status != 'moved' if tablebooking.sale.sale_status != 'completed' status = false end + end end if status table.status = "available" diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index b6398686..8ff59b45 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -137,7 +137,6 @@ count = 0 sub_total = 0 if @status_sale == "sale" - puts @sale_array[0] @sale_array[0].sale_items.each do |sale_item| count += 1 sub_total = sub_total + sale_item.price @@ -159,8 +158,6 @@ unless @order_items.nil? count = 0 @order_items.each do |order_item | - puts @order_items.size - puts "view" count += 1 sub_total = sub_total + order_item.price @@ -212,10 +209,13 @@ Pending New Order <% + count = 0 @order_items.each do |order_item | + count += 1 %> + @@ -225,14 +225,15 @@ end %>
      <%= count %> <%= order_item.item_name %> <%= order_item.qty %> <%= order_item.qty*order_item.price %>
      - + <% - else + end @sale_array.each do |sale| if @sale_array.size > 1 unless sale.receipt_no == @sale_array[0].receipt_no %> - Pending New Invoice +

      + Pending Payment @@ -240,7 +241,6 @@
      Receipt No - <%= sale.receipt_no %>
      <% - end end end end @@ -258,17 +258,23 @@ <% if @dining.bookings.length >= 1 %> - + - <% if @status_order == 'order' %> + + <% if @status_order == 'order' && @status_sale != 'sale' %> + + <% else %> + + + <% end %> - + <% end %>
      @@ -319,4 +325,19 @@ $('#move').on('click',function(){ $('#back').on('click',function(){ window.location.href = '/origami/'; }) + +$('#add_invoice').on('click',function(){ + var dining_id = "<%= @dining.id %>" + var sale_id = "<%= @obj_sale.sale_id rescue "" %>" + var ajax_url = "/origami/sale/append_order"; + $.ajax({ + type: "POST", + url: ajax_url, + data: 'dining_id='+ dining_id + "&sale_id=" + sale_id, + success:function(result){ + alert("Invoice updated") + window.location.reload(); + } + }); +}) diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index 83419ca0..fd2e78cb 100644 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -180,7 +180,7 @@ if @sale_array.size > 1 unless sale.receipt_no == @sale_array[0].receipt_no %> - Pending New Invoice + Pending Payment diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index fe36277b..923e3eef 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -24,7 +24,8 @@
      Receipt No - <%= sale.receipt_no %>
      - + + @@ -34,10 +35,16 @@
      Items#Items QTY Price
      - <% sub_total = 0 %> - <% @sale_data.sale_items.each do |sale_item| %> + <% sub_total = 0 + count = 0 + %> + <% @sale_data.sale_items.each do |sale_item| + count += 1 + %> + <% sub_total += sale_item.qty*sale_item.unit_price%> + @@ -236,7 +243,6 @@ - diff --git a/app/views/origami/sales/add_to_existing_invoice.json.jbuilder b/app/views/origami/sales/add_to_existing_invoice.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/sales/add_to_existing_invoice.json.jbuilder @@ -0,0 +1 @@ +json.status true diff --git a/config/routes.rb b/config/routes.rb index dd5831ae..3da4e9a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -80,6 +80,7 @@ Rails.application.routes.draw do get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" get 'sale/:sale_id' => 'sales#show' + post 'sale/append_order' => 'sales#add_to_existing_invoice' get 'room/:room_id' => 'rooms#show' get 'order/:order_id' => "orders#show" From cd5fdaac6a716dcedb05a94f61faa9553b198df6 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 22 Jun 2017 15:28:40 +0630 Subject: [PATCH 058/128] update origami scss --- app/assets/stylesheets/origami.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 30e3781d..2670dcc4 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -179,7 +179,9 @@ select.form-control { tr.discount-item-row:hover { background-color: #e3e3e3 !important; } - +.required abbr{ + color: red !important; +} /* Jquery Confirm */ .jconfirm-box-container{ From 4b9291110d63049e799852a7a648c3059efed1fc Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 22 Jun 2017 15:30:16 +0630 Subject: [PATCH 059/128] update origami customer --- app/views/origami/customers/index.html.erb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 8a811073..e862ea7f 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -75,7 +75,15 @@ <%= f.error_notification %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %> - +
      "> + <%= f.input :card_no, :class => "form-control col-md-6 card_no"%> + <% flash.each do |name, msg| %> + <% str="[\"#{msg['name']}\"]" + str.gsub!('["', '') + str.gsub!('"]', '') %> + <%= str %> + <% end -%> +

      -

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

      +

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

      @@ -304,7 +304,7 @@ $(document).ready(function(){ var sale_id = $('#save_order_id').attr('data-order'); } - window.location.href = '/origami/'+ sale_id + "/customers" + window.location.href = '/origami/'+ sale_id + "/customers" }); // Discount for Payment @@ -315,7 +315,7 @@ $(document).ready(function(){ }else{ var sale_id = $('#save_order_id').attr('data-order'); } - + if(sale_id!=""){ window.location.href = '/origami/' + sale_id + '/discount' } diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb index 495e1514..109bc418 100644 --- a/app/views/origami/moveroom/move_dining.html.erb +++ b/app/views/origami/moveroom/move_dining.html.erb @@ -86,7 +86,7 @@

      -

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

      +

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

      diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index 83419ca0..caa88660 100644 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -86,7 +86,7 @@

      -

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

      +

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

      diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index a480593a..0763c43f 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -119,7 +119,7 @@

      -

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

      +

      Date: <%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index c1797158..d734638b 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -113,7 +113,7 @@

      -

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

      +

      Date: <%= @obj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index e896a50a..5f3056fb 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -107,7 +107,7 @@

      -

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

      +

      Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb index 2191d814..8bdee23c 100644 --- a/app/views/reports/receipt_no/index.xls.erb +++ b/app/views/reports/receipt_no/index.xls.erb @@ -2,27 +2,27 @@
      <% unless @sale_data.empty? %> -

      <%=current_active_location.name%>

      -

      Sales Summary Report (BreadTalk)

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

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

      -<% end %> +

      <%=current_active_location.name%>

      +

      Sales Summary Report (BreadTalk)

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

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

      +<% end %>
      <%= count %> <%=sale_item.product_name%>@<%=sale_item.unit_price%>
      - - + + - + - + - + @@ -35,101 +35,101 @@ <% foc = 0 %> <% discount = 0 %> <% total = 0 %> - <% count = 1 %> + <% 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 %> + <% total_cash_received = 0 %> <% today_credit_payment_amount = 0 %> - <% old_location_id = 0%> - <% sub_total = 0 %> - <% count_of_void = 0 %> + <% old_location_id = 0%> + <% sub_total = 0 %> + <% count_of_void = 0 %> <% flag = false %> - <% @sale_data.each do |sale| %> + <% @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 %> + <% 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 += 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 %> + + <% 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%> + <% 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%> + + + + <%end %> + <% end%> + <% end%> + <% end%> + <% end%> <% if flag == true%> <% void += total_void_amount.to_f %> - - <% flag = false %> + + <% flag = false %> <% end%> - <%if count_of_void == 0%> - + <%if count_of_void == 0%> + <%end %> + <%= 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 => ',') %> + -<%count_of_void= 0%> +<%count_of_void= 0%> <% count = count + 1 %> <% end %> - + - - - - + + + + - - + + <% end %>
      Location Name DateCash SalesCash Sales Credit Sales Credit Received Card PaymentCard Payment Total Discount Total Taxes Total Other Charges FOC SalesVoid SalesVoid Sales Grand 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 => ',') %><%= 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[: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",sale[:foc_amount].to_f), :delimiter => ',') %> <%= number_with_delimiter(sprintf("%.2f",total_void_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",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",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 => ',') %><%= 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 +
      From 7bf2499e83ffb4c4691ec088d0bfa042c0c02a4a Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 22 Jun 2017 17:32:13 +0630 Subject: [PATCH 064/128] add options in oqs --- app/assets/javascripts/OQS.js | 5 ++-- app/controllers/crm/customers_controller.rb | 6 ++-- app/controllers/oqs/print_controller.rb | 27 +++++++++-------- .../origami/request_bills_controller.rb | 2 +- app/models/printer/order_queue_printer.rb | 20 ++++++++----- app/pdf/order_item_pdf.rb | 30 ++++++++----------- app/pdf/order_summary_pdf.rb | 12 ++++++++ app/views/oqs/home/index.html.erb | 4 +-- 8 files changed, 62 insertions(+), 44 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 87121ea3..4c8300e2 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -111,8 +111,9 @@ $(document).ready(function(){ // Print Order Item $('#print_order_item').on('click',function(){ - var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); - var params = { 'id':assigned_item_id }; + var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text(); + var options = $('.selected-item').children('.card-block').find('.item-options').text(); + var params = { 'options':options }; $.ajax({ type: 'GET', url: '/oqs/print/print/'+assigned_item_id, diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index ce585686..17012ad1 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -93,7 +93,8 @@ class Crm::CustomersController < BaseCrmController :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' - } + }, + :timeout => 10 ) rescue Net::OpenTimeout response = { status: false } @@ -163,7 +164,8 @@ end :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' - } + }, + :timeout => 10 ) rescue Net::OpenTimeout response = { status: false } diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index ff2cf98d..f3fd5675 100644 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -2,9 +2,10 @@ class Oqs::PrintController < ApplicationController # Print Order Item def print unique_code="OrderItemPdf" - 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 + "'"); + assigned_item_id = params[:id] + options = params[:options] + assigned_item = AssignedOrderItem.find(assigned_item_id) + assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); # order queue stations oqs = assigned_item.order_queue_station @@ -13,9 +14,9 @@ class Oqs::PrintController < ApplicationController print_status = assigned_item.print_status == true ? " (Re-Print)" : "" # 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(oqs, assigned_item.order_id, assigned_item.item_code, print_status ) + print_settings = PrintSetting.find_by_unique_code(unique_code) + order_queue_printer = Printer::OrderQueuePrinter.new(print_settings) + order_queue_printer.print_order_item(oqs, assigned_item.order_id, assigned_item.item_code, print_status, options ) # update print status for completed same order items assigned_items.each do |ai| @@ -27,10 +28,10 @@ class Oqs::PrintController < ApplicationController # Print Order Details with booking id def print_order_summary unique_code="OrderSummaryPdf" - assigned_item_id=params[:id] - table_name=params[:table_name] - assigned_item=AssignedOrderItem.find(assigned_item_id) - assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + assigned_item_id = params[:id] + table_name = params[:table_name] + assigned_item = AssignedOrderItem.find(assigned_item_id) + assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); # order queue stations oqs = assigned_item.order_queue_station @@ -43,13 +44,13 @@ class Oqs::PrintController < ApplicationController booking = Booking.find_by_dining_facility_id(dining.id) # print when complete click - print_settings=PrintSetting.find_by_unique_code(unique_code) - order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) + print_settings = PrintSetting.find_by_unique_code(unique_code) + order_queue_printer = Printer::OrderQueuePrinter.new(print_settings) order_queue_printer.print_booking_summary(oqs, booking.booking_id, print_status) # update print status for completed same order items assigned_items.each do |ai| - ai.print_status=true + ai.print_status = true ai.save end end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 37eef687..93453ffc 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -22,7 +22,7 @@ class Origami::RequestBillsController < BaseOrigamiController unique_code = "ReceiptBillPdf" # customer= Customer.where('customer_id=' +.customer_id) - customer= Customer.find( @sale_data.customer_id) + customer= Customer.find(@sale_data.customer_id) # get member information member_info = Customer.get_member_account(customer) # get printer info diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 63666a68..f8fb5027 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -1,13 +1,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker - def print_order_item(oqs,order_id, item_code, print_status) + def print_order_item(oqs,order_id, item_code, print_status, options="") #Use CUPS service #Generate PDF #Print order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" - pdf = OrderItemPdf.new(order_item[0], print_status) + pdf = OrderItemPdf.new(order_item[0], print_status, options) pdf.render_file filename if oqs.print_copy @@ -31,7 +31,9 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker if oqs.cut_per_item order.each do|odi| filename = "tmp/order_item_#{odi.item_name}" + ".pdf" - pdf = OrderItemPdf.new(odi, print_status) + # For Item Options + options = odi.options == "[]"? "" : odi.options + pdf = OrderItemPdf.new(odi, print_status, options) # pdf.render_file "tmp/order_item.pdf" pdf.render_file filename if oqs.print_copy @@ -65,7 +67,10 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker if oqs.cut_per_item order.each do|odi| filename = "tmp/order_item_#{odi.item_name}" + ".pdf" - pdf = OrderItemPdf.new(odi, print_status) + # For Item Options + options = odi.options == "[]"? "" : odi.options + pdf = OrderItemPdf.new(odi, print_status, options) + pdf.render_file filename if oqs.print_copy @@ -98,7 +103,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # Query for OQS with status def print_query(type, id) if type == "order_item" - 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") + OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, 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.booking_id = bo.booking_id @@ -107,16 +112,17 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker .where("order_items.item_code = '#{ id }'") .group("order_items.item_code") elsif type == "order_summary" - 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") + OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, 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.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 = '#{ id }'") + .group("order_items.order_items_id") else # order summary for booking - 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") + OrderItem.select("order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, 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.booking_id = bo.booking_id diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index e5c5395f..749a8a16 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -1,6 +1,6 @@ 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, print_status) + def initialize(order_item, print_status, options) self.page_width = 210 self.page_height = 2500 self.margin = 5 @@ -29,7 +29,7 @@ class OrderItemPdf < Prawn::Document order_info(order_item.order_by,order_item.order_at) # order items - order_items(order_item) + order_items(order_item, options) end # Write Order Information to PDF @@ -52,23 +52,11 @@ class OrderItemPdf < Prawn::Document end # Write Order items to PDF - def order_items(order_item) + def order_items(order_item, options) 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) + add_order_items(order_item, options) dash(1, :space => 1, :phase => 1) stroke_horizontal_line 0, (self.page_width - self.margin) @@ -76,7 +64,7 @@ class OrderItemPdf < Prawn::Document end # Add order items under order info - def add_order_items(order_item) + def add_order_items(order_item, options) y_position = cursor move_down 5 @@ -91,6 +79,14 @@ class OrderItemPdf < Prawn::Document move_down 5 + # add option + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{options}", :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 a1459512..b9c1f6fe 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -92,6 +92,18 @@ class OrderSummaryPdf < Prawn::Document end move_down 5 + + # add option + options = odi.options == "[]"? "" : odi.options + + if options != "" + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{options}", :size => self.item_font_size,:align => :left + end + + move_down 5 + end end end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index e38c859e..85858a02 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -50,7 +50,7 @@ ] -

      <%= qid.options %>

      +

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

      Order at @@ -100,7 +100,7 @@ ] -

      <%= qid.options %>

      +

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

      Order at From 5d60d620b4848f5289a73e25cf9931260d88326c Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 22 Jun 2017 18:03:16 +0630 Subject: [PATCH 065/128] add for room tab and complete --- app/models/sale.rb | 2 +- app/views/origami/home/show.html.erb | 1 + app/views/origami/rooms/show.html.erb | 56 +++++++++++++++++++++++++-- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 6b02e4c8..f79d8642 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -15,7 +15,7 @@ class Sale < ApplicationRecord 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}'") } - scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } + scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") } REPORT_TYPE = { "daily" => 0, diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 364b0f91..7bc62af7 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -338,6 +338,7 @@ $('#pay').on('click',function() { window.location.href = '/origami/sale/'+ sale_id + "/payment"; }); +// Bill Request $('#request_bills').click(function() { var order_id = $('#save_order_id').attr('data-order'); var ajax_url = "/origami/" + order_id + "/request_bills"; diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index c1797158..d3b78719 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -98,7 +98,7 @@

      <% if @status == "order" %> -
      ORDER DETAILS
      +
      ORDER DETAILS
      <% else %>
      INVOICE DETAILS
      <% end %> @@ -139,7 +139,7 @@ sub_total = sub_total + sale_item.price %> - <% unless sale_item.price <= 0 %> + <% unless sale_item.price == 0 %> <%= sale_item.product_name %> <%= sale_item.qty %> @@ -155,7 +155,7 @@ @order_items.each do |order_item | sub_total = sub_total + order_item.price - unless order_item.price <= 0 %> + unless order_item.price == 0 %> <%= order_item.item_name %> <%= order_item.qty %> @@ -259,15 +259,65 @@ $(document).ready(function(){ var order_id = $(this).attr("data-id"); window.location.href = '/origami/order/' + order_id; }) + + // bind customer to order or sale + $("#customer").on('click', function(){ + var sale = $('#sale_id').val(); + if (sale) { + var sale_id = sale + }else{ + var sale_id = $('#save_order_id').attr('data-order'); + } + + window.location.href = '/origami/'+ sale_id + "/customers" + }); + + // Discount for Payment + $('#discount').click(function() { + var sale = $('#sale_id').val(); + if (sale!="") { + var sale_id = sale + }else{ + var sale_id = $('#save_order_id').attr('data-order'); + } + + if(sale_id!=""){ + window.location.href = '/origami/' + sale_id + '/discount' + } + else { + alert("Please select an table!"); + } + + return false; + }); }); + + $('#pay').on('click',function() { var sale_id = $('#sale_id').val(); window.location.href = '/origami/sale/'+ sale_id + "/payment"; }); + +// Bill Request +$('#request_bills').click(function() { + var order_id = $('#save_order_id').attr('data-order'); + var ajax_url = "/origami/" + order_id + "/request_bills"; + $.ajax({ + type: "POST", + url: ajax_url, + data: 'order_id='+ order_id, + success:function(result){ + + location.reload(); + } + }); +}); + $('#move').on('click',function(){ var dining_id = "<%= @room.id %>" window.location.href = '/origami/table/'+ dining_id + "/moveroom"; }) + $('#back').on('click',function(){ window.location.href = '/origami/'; }) From a90bbbebec6e96242dea7313cc49c411e1ea60b7 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 22 Jun 2017 18:06:56 +0630 Subject: [PATCH 066/128] merge with origin master --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 227cfa72..22275707 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -gem 'pg' +# gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' From 01e5b7ba6c3d849fd464efb3131a13779dfb2473 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 23 Jun 2017 09:41:48 +0630 Subject: [PATCH 067/128] update authorize --- .../javascripts/reports/daily_sales.coffee | 3 + .../javascripts/reports/dailysales.coffee | 3 + .../javascripts/reports/sale_items.coffee | 3 + .../stylesheets/reports/daily_sales.scss | 3 + .../stylesheets/reports/dailysales.scss | 3 + .../stylesheets/reports/sale_items.scss | 3 + app/controllers/base_crm_controller.rb | 12 +- app/controllers/base_oqs_controller.rb | 8 + app/controllers/base_report_controller.rb | 9 + app/controllers/crm/bookings_controller.rb | 2 +- app/controllers/crm/customers_controller.rb | 1 + .../crm/dining_queues_controller.rb | 1 + app/controllers/home_controller.rb | 6 + .../origami/discounts_controller.rb | 1 + .../origami/moveroom_controller.rb | 4 +- .../origami/movetable_controller.rb | 2 + .../origami/payments_controller.rb | 2 +- .../origami/request_bills_controller.rb | 2 +- app/controllers/print_settings_controller.rb | 1 + ...ntroller.rb => bksale_items_controller.rb} | 4 +- .../reports/daily_sales_controller.rb | 17 ++ ...troller.rb => daily_salesbk_controller.rb} | 4 +- .../reports/sale_items_controller.rb | 19 ++ .../settings/accounts_controller.rb | 1 + .../settings/cashier_terminals_controller.rb | 1 + .../settings/membership_actions_controller.rb | 1 + .../membership_settings_controller.rb | 1 + .../settings/menu_categories_controller.rb | 1 + .../menu_item_attributes_controller.rb | 1 + .../menu_item_instances_controller.rb | 1 + .../settings/menu_item_options_controller.rb | 1 + app/controllers/settings/menus_controller.rb | 1 + .../order_queue_stations_controller.rb | 1 + .../payment_method_settings_controller.rb | 1 + .../settings/tax_profiles_controller.rb | 1 + app/controllers/settings/zones_controller.rb | 1 + .../transactions/orders_controller.rb | 1 + .../transactions/sales_controller.rb | 1 + app/helpers/reports/daily_sales_helper.rb | 2 + app/helpers/reports/dailysales_helper.rb | 2 + app/helpers/reports/sale_items_helper.rb | 2 + app/models/ability.rb | 62 ++++-- app/views/layouts/_header.html.erb | 4 +- app/views/origami/home/show.html.erb | 7 + app/views/reports/daily_sale/index.html.erb | 4 +- .../_shift_sale_report_filter.html.erb | 151 ++++++++++++++ app/views/reports/daily_sales/index.html.erb | 190 ++++++++++++++++++ app/views/reports/daily_sales/index.xls.erb | 116 +++++++++++ app/views/reports/sale_item/index.html.erb | 4 +- .../_shift_sale_report_filter.html.erb | 156 ++++++++++++++ app/views/reports/sale_items/index.html.erb | 141 +++++++++++++ app/views/reports/sale_items/index.xls.erb | 136 +++++++++++++ app/views/settings/lookups/index.html.erb | 4 +- config/routes.rb | 6 +- .../reports/daily_sales_controller_spec.rb | 5 + .../reports/dailysales_controller_spec.rb | 5 + .../reports/sale_items_controller_spec.rb | 5 + .../reports/daily_sales_helper_spec.rb | 15 ++ .../helpers/reports/dailysales_helper_spec.rb | 15 ++ .../helpers/reports/sale_items_helper_spec.rb | 15 ++ 60 files changed, 1141 insertions(+), 34 deletions(-) create mode 100644 app/assets/javascripts/reports/daily_sales.coffee create mode 100644 app/assets/javascripts/reports/dailysales.coffee create mode 100644 app/assets/javascripts/reports/sale_items.coffee create mode 100644 app/assets/stylesheets/reports/daily_sales.scss create mode 100644 app/assets/stylesheets/reports/dailysales.scss create mode 100644 app/assets/stylesheets/reports/sale_items.scss rename app/controllers/reports/{sale_item_controller.rb => bksale_items_controller.rb} (74%) create mode 100644 app/controllers/reports/daily_sales_controller.rb rename app/controllers/reports/{daily_sale_controller.rb => daily_salesbk_controller.rb} (72%) create mode 100644 app/controllers/reports/sale_items_controller.rb create mode 100644 app/helpers/reports/daily_sales_helper.rb create mode 100644 app/helpers/reports/dailysales_helper.rb create mode 100644 app/helpers/reports/sale_items_helper.rb create mode 100644 app/views/reports/daily_sales/_shift_sale_report_filter.html.erb create mode 100644 app/views/reports/daily_sales/index.html.erb create mode 100644 app/views/reports/daily_sales/index.xls.erb create mode 100644 app/views/reports/sale_items/_shift_sale_report_filter.html.erb create mode 100644 app/views/reports/sale_items/index.html.erb create mode 100644 app/views/reports/sale_items/index.xls.erb create mode 100644 spec/controllers/reports/daily_sales_controller_spec.rb create mode 100644 spec/controllers/reports/dailysales_controller_spec.rb create mode 100644 spec/controllers/reports/sale_items_controller_spec.rb create mode 100644 spec/helpers/reports/daily_sales_helper_spec.rb create mode 100644 spec/helpers/reports/dailysales_helper_spec.rb create mode 100644 spec/helpers/reports/sale_items_helper_spec.rb diff --git a/app/assets/javascripts/reports/daily_sales.coffee b/app/assets/javascripts/reports/daily_sales.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/reports/daily_sales.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/reports/dailysales.coffee b/app/assets/javascripts/reports/dailysales.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/reports/dailysales.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/reports/sale_items.coffee b/app/assets/javascripts/reports/sale_items.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/reports/sale_items.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/reports/daily_sales.scss b/app/assets/stylesheets/reports/daily_sales.scss new file mode 100644 index 00000000..79ed876a --- /dev/null +++ b/app/assets/stylesheets/reports/daily_sales.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the reports/daily_sales 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/reports/dailysales.scss b/app/assets/stylesheets/reports/dailysales.scss new file mode 100644 index 00000000..cfc48374 --- /dev/null +++ b/app/assets/stylesheets/reports/dailysales.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the reports/dailysales 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/reports/sale_items.scss b/app/assets/stylesheets/reports/sale_items.scss new file mode 100644 index 00000000..b9692327 --- /dev/null +++ b/app/assets/stylesheets/reports/sale_items.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the reports/sale_items controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb index a6bf7754..38f0df3d 100644 --- a/app/controllers/base_crm_controller.rb +++ b/app/controllers/base_crm_controller.rb @@ -1,9 +1,17 @@ class BaseCrmController < ActionController::Base - include LoginVerification - layout "CRM" + include LoginVerification + layout "CRM" #before_action :check_installation protect_from_forgery with: :exception + rescue_from CanCan::AccessDenied do |exception| + flash[:warning] = exception.message + redirect_to root_path + end + + def current_user + @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] + end end diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb index 16fe9b07..50d7bd55 100644 --- a/app/controllers/base_oqs_controller.rb +++ b/app/controllers/base_oqs_controller.rb @@ -5,5 +5,13 @@ class BaseOqsController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + rescue_from CanCan::AccessDenied do |exception| + flash[:warning] = exception.message + redirect_to root_path + end + + def current_user + @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] + end end diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb index 0ea51cf5..28ba5c2b 100644 --- a/app/controllers/base_report_controller.rb +++ b/app/controllers/base_report_controller.rb @@ -5,6 +5,15 @@ class BaseReportController < ActionController::Base #before_action :check_installation protect_from_forgery with: :exception + rescue_from CanCan::AccessDenied do |exception| + flash[:warning] = exception.message + redirect_to root_path + end + + def current_user + @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] + end + PERIOD = { "today" => 0, "yesterday" => 1, diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb index 65511512..efaa5419 100644 --- a/app/controllers/crm/bookings_controller.rb +++ b/app/controllers/crm/bookings_controller.rb @@ -1,5 +1,5 @@ class Crm::BookingsController < BaseCrmController - + load_and_authorize_resource 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 ce585686..41d3d6ad 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -1,4 +1,5 @@ class Crm::CustomersController < BaseCrmController + load_and_authorize_resource except: [:create] before_action :set_crm_customer, only: [:show, :edit, :update, :destroy] # GET /crm/customers diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb index 734793b3..c4d9426b 100644 --- a/app/controllers/crm/dining_queues_controller.rb +++ b/app/controllers/crm/dining_queues_controller.rb @@ -1,4 +1,5 @@ class Crm::DiningQueuesController < BaseCrmController + load_and_authorize_resource before_action :set_dining_queue, only: [:show, :edit, :update, :destroy] # GET /crm/dining_queues diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 29e9082a..f480b95f 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -18,6 +18,12 @@ class HomeController < ApplicationController elsif @employee.role == "cashier" session[:session_token] = @employee.token_session redirect_to origami_root_path + elsif @employee.role == "manager" + session[:session_token] = @employee.token_session + redirect_to dashboard_path + elsif @employee.role == "accountant" + session[:session_token] = @employee.token_session + redirect_to dashboard_path else render :index end diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index a195bb6a..0c9971f4 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -1,4 +1,5 @@ class Origami::DiscountsController < BaseOrigamiController + authorize_resource :class => false #discount page show from origami index with selected order def index diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb index c51fcbb1..ef1c286a 100644 --- a/app/controllers/origami/moveroom_controller.rb +++ b/app/controllers/origami/moveroom_controller.rb @@ -1,5 +1,7 @@ class Origami::MoveroomController < BaseOrigamiController - + + authorize_resource :class => false + def move_dining @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index cc6281ce..fa067976 100644 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -1,4 +1,6 @@ class Origami::MovetableController < BaseOrigamiController + + authorize_resource :class => false def move_dining @tables = Table.all.active.order('status desc') diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 38225fae..d415c965 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -1,6 +1,6 @@ class Origami::PaymentsController < BaseOrigamiController - + authorize_resource :class => false def index end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 1bce60e6..58419abe 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -1,5 +1,5 @@ class Origami::RequestBillsController < BaseOrigamiController - load_and_authorize_resource + # Print Request Bill and add to sale tables def print @sale = Sale.new diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index fa5af7e8..bdd3061a 100644 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -1,4 +1,5 @@ class PrintSettingsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_print_setting, only: [:show, :edit, :update, :destroy] # GET /print_settings diff --git a/app/controllers/reports/sale_item_controller.rb b/app/controllers/reports/bksale_items_controller.rb similarity index 74% rename from app/controllers/reports/sale_item_controller.rb rename to app/controllers/reports/bksale_items_controller.rb index eb7d3b86..1f349320 100644 --- a/app/controllers/reports/sale_item_controller.rb +++ b/app/controllers/reports/bksale_items_controller.rb @@ -1,5 +1,5 @@ -class Reports::SaleItemController < BaseReportController - +class Reports::SaleItemsController < BaseReportController + authorize_resource :class => false def index from, to, report_type = get_date_range_from_params diff --git a/app/controllers/reports/daily_sales_controller.rb b/app/controllers/reports/daily_sales_controller.rb new file mode 100644 index 00000000..6d99551d --- /dev/null +++ b/app/controllers/reports/daily_sales_controller.rb @@ -0,0 +1,17 @@ +class Reports::DailySalesController < BaseReportController + # authorize_resource :class => false + def index + from, to ,report_type = get_date_range_from_params + @sale_data = Sale.daily_sales_list(from,to) + @tax = SaleTax.get_tax(from,to) + respond_to do |format| + format.html + format.xls + end + end + + def show + + end + +end \ No newline at end of file diff --git a/app/controllers/reports/daily_sale_controller.rb b/app/controllers/reports/daily_salesbk_controller.rb similarity index 72% rename from app/controllers/reports/daily_sale_controller.rb rename to app/controllers/reports/daily_salesbk_controller.rb index ba453f55..1a878aaa 100644 --- a/app/controllers/reports/daily_sale_controller.rb +++ b/app/controllers/reports/daily_salesbk_controller.rb @@ -1,5 +1,5 @@ -class Reports::DailySaleController < BaseReportController - +class Reports::DailySalesController < BaseReportController + authorize_resource :class => false def index from, to ,report_type = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) diff --git a/app/controllers/reports/sale_items_controller.rb b/app/controllers/reports/sale_items_controller.rb new file mode 100644 index 00000000..81f7af01 --- /dev/null +++ b/app/controllers/reports/sale_items_controller.rb @@ -0,0 +1,19 @@ +class Reports::SaleItemsController < BaseReportController + # authorize_resource :class => false + def index + + from, to, report_type = get_date_range_from_params + + @sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type) + + respond_to do |format| + format.html + format.xls + end + 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 90e6a304..54f27480 100644 --- a/app/controllers/settings/accounts_controller.rb +++ b/app/controllers/settings/accounts_controller.rb @@ -1,4 +1,5 @@ class Settings::AccountsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_account, only: [:show, :edit, :update, :destroy] # GET /settings/accounts diff --git a/app/controllers/settings/cashier_terminals_controller.rb b/app/controllers/settings/cashier_terminals_controller.rb index b397d68d..0808c0a7 100644 --- a/app/controllers/settings/cashier_terminals_controller.rb +++ b/app/controllers/settings/cashier_terminals_controller.rb @@ -1,4 +1,5 @@ class Settings::CashierTerminalsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_cashier_terminal, only: [:show, :edit, :update, :destroy] # GET /settings/cashier_terminals diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index ad7311f2..f386aecd 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -1,4 +1,5 @@ class Settings::MembershipActionsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_membership_action, only: [:show, :edit, :update, :destroy] # GET /settings/membership_actions diff --git a/app/controllers/settings/membership_settings_controller.rb b/app/controllers/settings/membership_settings_controller.rb index cfd672d0..36bb0092 100644 --- a/app/controllers/settings/membership_settings_controller.rb +++ b/app/controllers/settings/membership_settings_controller.rb @@ -1,4 +1,5 @@ class Settings::MembershipSettingsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_membership_setting, only: [:show, :edit, :update, :destroy] # GET /settings/membership_settings diff --git a/app/controllers/settings/menu_categories_controller.rb b/app/controllers/settings/menu_categories_controller.rb index c2a521ae..8ca9cfb4 100644 --- a/app/controllers/settings/menu_categories_controller.rb +++ b/app/controllers/settings/menu_categories_controller.rb @@ -1,4 +1,5 @@ class Settings::MenuCategoriesController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_menu_category, only: [:show, :edit, :update, :destroy] before_action :set_settings_menu, only: [:new] diff --git a/app/controllers/settings/menu_item_attributes_controller.rb b/app/controllers/settings/menu_item_attributes_controller.rb index 1433cf34..162325a2 100644 --- a/app/controllers/settings/menu_item_attributes_controller.rb +++ b/app/controllers/settings/menu_item_attributes_controller.rb @@ -1,4 +1,5 @@ class Settings::MenuItemAttributesController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_menu_item_attribute, only: [:show, :edit, :update, :destroy] # GET /settings/menu_item_attributes diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb index 2b1fcecf..fd651e5e 100644 --- a/app/controllers/settings/menu_item_instances_controller.rb +++ b/app/controllers/settings/menu_item_instances_controller.rb @@ -1,4 +1,5 @@ class Settings::MenuItemInstancesController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_menu_item_instance, only: [:show, :edit, :update, :destroy] before_action :set_settings_menu_item, only: [ :show, :edit, :new, :update] diff --git a/app/controllers/settings/menu_item_options_controller.rb b/app/controllers/settings/menu_item_options_controller.rb index 4a3a44b7..41679796 100644 --- a/app/controllers/settings/menu_item_options_controller.rb +++ b/app/controllers/settings/menu_item_options_controller.rb @@ -1,4 +1,5 @@ class Settings::MenuItemOptionsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_menu_item_option, only: [:show, :edit, :update, :destroy] # GET /settings/menu_item_options diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index fa6ac158..1a5ada31 100644 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -1,4 +1,5 @@ class Settings::MenusController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_menu, only: [:show, :edit, :update, :destroy] # GET /settings/menus diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index 5a540ddb..9fe78de4 100644 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -1,4 +1,5 @@ class Settings::OrderQueueStationsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy] # GET /settings/order_queue_stations diff --git a/app/controllers/settings/payment_method_settings_controller.rb b/app/controllers/settings/payment_method_settings_controller.rb index f3ac595e..ecbbcced 100644 --- a/app/controllers/settings/payment_method_settings_controller.rb +++ b/app/controllers/settings/payment_method_settings_controller.rb @@ -1,4 +1,5 @@ class Settings::PaymentMethodSettingsController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_payment_method_setting, only: [:show, :edit, :update, :destroy] # GET /settings/payment_method_settings diff --git a/app/controllers/settings/tax_profiles_controller.rb b/app/controllers/settings/tax_profiles_controller.rb index 1064055b..992f637a 100644 --- a/app/controllers/settings/tax_profiles_controller.rb +++ b/app/controllers/settings/tax_profiles_controller.rb @@ -1,4 +1,5 @@ class Settings::TaxProfilesController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_tax_profile, only: [:show, :edit, :update, :destroy] # GET /settings/tax_profiles diff --git a/app/controllers/settings/zones_controller.rb b/app/controllers/settings/zones_controller.rb index 08a6f189..49505854 100644 --- a/app/controllers/settings/zones_controller.rb +++ b/app/controllers/settings/zones_controller.rb @@ -1,4 +1,5 @@ class Settings::ZonesController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_settings_zone, only: [:show, :edit, :update, :destroy] # GET /settings/zones diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb index 35cefe6f..8303780f 100644 --- a/app/controllers/transactions/orders_controller.rb +++ b/app/controllers/transactions/orders_controller.rb @@ -1,4 +1,5 @@ class Transactions::OrdersController < ApplicationController + load_and_authorize_resource except: [:create] def index filter = params[:filter] diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index 0a069b1b..29b6cda2 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -1,4 +1,5 @@ class Transactions::SalesController < ApplicationController + load_and_authorize_resource except: [:create] before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy] # GET /transactions/sales diff --git a/app/helpers/reports/daily_sales_helper.rb b/app/helpers/reports/daily_sales_helper.rb new file mode 100644 index 00000000..eb04c7b9 --- /dev/null +++ b/app/helpers/reports/daily_sales_helper.rb @@ -0,0 +1,2 @@ +module Reports::DailySalesHelper +end diff --git a/app/helpers/reports/dailysales_helper.rb b/app/helpers/reports/dailysales_helper.rb new file mode 100644 index 00000000..94e34c27 --- /dev/null +++ b/app/helpers/reports/dailysales_helper.rb @@ -0,0 +1,2 @@ +module Reports::DailysalesHelper +end diff --git a/app/helpers/reports/sale_items_helper.rb b/app/helpers/reports/sale_items_helper.rb new file mode 100644 index 00000000..63e884d7 --- /dev/null +++ b/app/helpers/reports/sale_items_helper.rb @@ -0,0 +1,2 @@ +module Reports::SaleItemsHelper +end diff --git a/app/models/ability.rb b/app/models/ability.rb index f48220a8..f3e8da5c 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -8,26 +8,62 @@ class Ability can :manage, :all + elsif user.role == "manager" + + can :manage, Menu + can :manage, MenuCategory + can :manage, MenuItemAttribute + can :manage, MenuItemInstance + can :manage, MenuItemOption + can :manage, SetMenuItem + can :manage, OrderQueueStation + can :manage, Zone + can :manage, CashierTerminal + can :manage, Employee + can :manage, MembershipSetting + can :manage, MembershipAction + can :manage, PaymentMethodSetting + can :manage, TaxProfile + can :manage, PrintSetting + can :manage, Account + + can :manage, Order + can :manage, Sale + + can :index, :dailysale + can :index, :saleitem + elsif user.role == "cashier" - can :read, Order - can :update, Order + can :read, Order + can :update, Order - can :read, Sale - can :update, Sale + can :read, Sale + can :update, Sale - can :add_customer, Customer - can :update_sale_by_customer, Customer + can :add_customer, Customer + can :update_sale_by_customer, Customer + + can :index, :discount + can :create, :discount + + can :show, :payment + can :create, :payment + can :reprint, :payment + + can :move_dining, :movetable + can :moving, :movetable + + can :move_dining, :moveroom elsif user.role == "accountant" - can :read, Order - can :update, Order - can :completed_order_item, Order - - can :read, Sale - can :update, Sale - can :manual_complete_sale, Sale + can :index, :dailysale + can :index, :saleitem + can :index, :receiptno + can :show, :dailysale + can :show, :saleitem + can :show, :receiptno end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index c528003d..24211081 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -38,8 +38,8 @@
      • -
      • <%= link_to "Daily Sale Report", reports_daily_sale_index_path, :tabindex =>"-1" %>
        • -
      • <%= link_to "Sales Item Report", reports_sale_item_index_path, :tabindex =>"-1" %>
        • +
      • <%= link_to "Daily Sale Report", reports_daily_sales_path, :tabindex =>"-1" %>
        • +
      • <%= link_to "Sales Item Report", reports_sale_items_path, :tabindex =>"-1" %>
      • <%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %>
      • diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2719a758..a56d1266 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -307,6 +307,13 @@ $(document).ready(function(){ window.location.href = '/origami/'+ sale_id + "/customers" }); + $('#re-print').click(function() { + var sale_id = $('#sale_id').val(); + window.location.href = '/origami/'+ sale_id + "/reprint" + + return false; + }); + // Discount for Payment $('#discount').click(function() { var sale = $('#sale_id').val(); diff --git a/app/views/reports/daily_sale/index.html.erb b/app/views/reports/daily_sale/index.html.erb index a2403045..7c2a8c61 100644 --- a/app/views/reports/daily_sale/index.html.erb +++ b/app/views/reports/daily_sale/index.html.erb @@ -7,14 +7,14 @@
      <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_daily_sale_index_path} %> + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_daily_sales_path} %>
      - Export to Excel + Export to Excel
      diff --git a/app/views/reports/daily_sales/_shift_sale_report_filter.html.erb b/app/views/reports/daily_sales/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..3a5d788c --- /dev/null +++ b/app/views/reports/daily_sales/_shift_sale_report_filter.html.erb @@ -0,0 +1,151 @@ +
      +
      + <%= 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_sales/index.html.erb b/app/views/reports/daily_sales/index.html.erb new file mode 100644 index 00000000..7c2a8c61 --- /dev/null +++ b/app/views/reports/daily_sales/index.html.erb @@ -0,0 +1,190 @@ +
      +
        +
      • Home
        • +
      • Daily Sale Report
        • +
      +
      + +
      + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_daily_sales_path} %> +
      +
      + +
      +
      +
      + Export to Excel +
      +
      +
      + +
      +
      +
      + + + <% if params[:from]%> + + + + <% end %> + + + + + + + + + + + + + + + + + + + <% unless @sale_data.empty? %> + + + <% void = 0 %> + <% mpu = 0 %> + <% master = 0 %> + <% visa = 0 %> + <% jcb = 0 %> + <% paypar = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% grand_total = 0 %> + <% count = 1 %> <% rounding_adj = 0 %> + <% @sale_data.each do |sale| %> + <% void += sale[:void_amount] %> + <% mpu += sale[:mpu_amount] %> + <% master += sale[:master_amount] %> + <% visa += sale[:visa_amount] %> + <% jcb += sale[:jcb_amount] %> + <% paypar += sale[:paypar_amount] %> + <% cash += sale[:cash_amount] %> + <% credit += sale[:credit_amount] %> + <% foc += sale[:foc_amount] %> + <% discount += sale[:total_discount] %> + <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> + <% grand_total += sale[:grand_total].to_f %> + <% rounding_adj += sale[:rounding_adj].to_f %> + + + + + + + + + + + + + + + + + + <% count = count + 1 %> + <% end %> + + + + + + + + + + + + + + + + + + <% total_tax = 0 %> + <% unless @tax.empty? %> + <% @tax.each do |tax| %> + <% total_tax += tax.tax_amount.to_f %> + + + + + + + <% end %> + <% net = total - total_tax %> + + + + + + <% end %> + + <% end %> +
      Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
      Sr.noDateVoid AmountMpu SalesMaster SalesVisa SalesJcb SalesPaypar SalesCash SalesCredit SalesFOC Sales(Discount)Grand Total +
      Rounding Adj.      		Rounding Adj.Grand Total
      <%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
      Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
      <%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
      Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
      +
      +
      +
      + + + \ No newline at end of file diff --git a/app/views/reports/daily_sales/index.xls.erb b/app/views/reports/daily_sales/index.xls.erb new file mode 100644 index 00000000..67e76e3c --- /dev/null +++ b/app/views/reports/daily_sales/index.xls.erb @@ -0,0 +1,116 @@ +
      +
      + + + <% if params[:from]%> + + + + <% end %> + + + + + + + + + + + + + + + + + + + <% unless @sale_data.empty? %> + + + <% void = 0 %> + <% mpu = 0 %> + <% master = 0 %> + <% visa = 0 %> + <% jcb = 0 %> + <% paypar = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% grand_total = 0 %> + <% count = 1 %> <% rounding_adj = 0 %> + <% @sale_data.each do |sale| %> + <% void += sale[:void_amount] %> + <% mpu += sale[:mpu_amount] %> + <% master += sale[:master_amount] %> + <% visa += sale[:visa_amount] %> + <% jcb += sale[:jcb_amount] %> + <% paypar += sale[:paypar_amount] %> + <% cash += sale[:cash_amount] %> + <% credit += sale[:credit_amount] %> + <% foc += sale[:foc_amount] %> + <% discount += sale[:total_discount] %> + <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f %> + <% grand_total += sale[:grand_total].to_f %> + <% rounding_adj += sale[:rounding_adj].to_f %> + + + + + + + + + + + + + + + + + + <% count = count + 1 %> + <% end %> + + + + + + + + + + + + + + + + + + <% total_tax = 0 %> + <% unless @tax.empty? %> + <% @tax.each do |tax| %> + <% total_tax += tax.tax_amount.to_f %> + + + + + + + <% end %> + <% net = total - total_tax %> + + + + + + <% end %> + + <% end %> +
      Sale (<%= params[:from] rescue '-' %> - <%= params[:to] rescue '-'%>)
      Sr.noDateVoid AmountMpu SalesMaster SalesVisa SalesJcb SalesPaypar SalesCash SalesCredit SalesFOC Sales(Discount)Grand Total +
      Rounding Adj.      		Rounding Adj.Grand Total
      <%= count %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%>
      Total<%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)<%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%>
      <%= tax.tax_name rescue '-'%><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%> 
      Net Amount<%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%> 
      +
      +
      \ No newline at end of file diff --git a/app/views/reports/sale_item/index.html.erb b/app/views/reports/sale_item/index.html.erb index cce5a210..a3b460fc 100644 --- a/app/views/reports/sale_item/index.html.erb +++ b/app/views/reports/sale_item/index.html.erb @@ -7,14 +7,14 @@
      <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_sale_item_index_path} %> + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_sale_items_path} %>
      - Export to Excel + Export to Excel
      diff --git a/app/views/reports/sale_items/_shift_sale_report_filter.html.erb b/app/views/reports/sale_items/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..7f95b6b9 --- /dev/null +++ b/app/views/reports/sale_items/_shift_sale_report_filter.html.erb @@ -0,0 +1,156 @@ +
      +
      + <%= 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/sale_items/index.html.erb b/app/views/reports/sale_items/index.html.erb new file mode 100644 index 00000000..a3b460fc --- /dev/null +++ b/app/views/reports/sale_items/index.html.erb @@ -0,0 +1,141 @@ +
      +
        +
      • Home
        • +
      • Daily Sale Report
        • +
      +
      + +
      + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_sale_items_path} %> +
      +
      + +
      +
      +
      + Export to Excel +
      +
      +
      + +
      +
      +
      + + + + + + + + + + + + + + + + + + +
      Date
      Menu CategoryCodeProductTotal ItemUnit PriceRevenue
      +
      +
      +
      + + \ No newline at end of file diff --git a/app/views/reports/sale_items/index.xls.erb b/app/views/reports/sale_items/index.xls.erb new file mode 100644 index 00000000..2807ec3f --- /dev/null +++ b/app/views/reports/sale_items/index.xls.erb @@ -0,0 +1,136 @@ + + + + + + + +
      +<% unless @sale_data.blank? %> + + + + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + + <% acc_arr = Array.new %> + <% cate_arr = Array.new %> + + <% sub_total = 0.0 %> + <% count = 0%> + <% total_price = 0.0 %> + <% cate_count = 0 %> + <% acc_count = 0%> + <% grand_total = 0%> + <% total_discount = 0.0 %> + + <% @sale_data.order("total_item desc").each do |sale| %> + + <% if !acc_arr.include?(sale.account_id) %> + + + + + + + <% acc_arr.push(sale.account_id) %> + + <% end %> + + + <% if !cate_arr.include?(sale.menu_category_id) %> + + <% cate_arr.push(sale.menu_category_id) %> + <% else %> + + <% end %> + + <% if @item_table == 'sale' %> + <% if sale.item_remark == 'FOC' %> + + <% elsif sale.item_remark == 'FOC ITEM' %> + + <% elsif sale.item_remark == 'DISCOUNT' %> + + <% else %> + + <% end %> + <% if sale.item_remark == 'DISCOUNT' %> + + + + <% total_price += sale.total_price %> + <% else %> + + + + <% end %> + <% else %> + + + + + <% end %> + + + + <% @menu_cate_count.each do |key,value| %> + <% if sale.menu_category_id == key %> + <% count = count + 1 %> + <% sub_total += sale.grand_total %> + <% if count == value %> + + + + + + <% sub_total = 0.0%> + <% total_discount = total_discount + total_price %> + <% total_price = 0.0%> + <% count = 0%> + <% end %> + <% end %> + <% end %> + + <% grand_total += sale.grand_total%> + <% end %> + + + + + + +
      From Date : <%= params[:from] %> , To Date : <%= params[:to] %>
      Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
       Menu CategoryCodeProductTotal ItemUnit PriceRevenue
      <%= sale.account_name %> Total Price By <%= sale.account_name %> + <% @totalByAccount.each do |account, total| %> + <% if sale.account_id == account %> + <%= total %> + <% end %> + <% end %> +
       <%= sale.menu_category_name %> <%= sale.code rescue '-' %><%= '[PROMO] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:QTY] '.to_s + sale.product_name.to_s rescue '-' %><%= '[DIS:TP] '.to_s + sale.product_name.to_s rescue '-' %><%= sale.product_name.to_s rescue '-' %> - - <%= sale.total_price.abs rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %><%= sale.product_name.to_s rescue '-' %><%= sale.total_item.abs rescue '-' %><%= sale.unit_price rescue '-' %><%= sale.grand_total.abs rescue '-' %>
       Sub Total<%= sub_total + total_price %>
       Grand Total<%= grand_total + total_discount %>
      +<% end %> +
      + + \ No newline at end of file diff --git a/app/views/settings/lookups/index.html.erb b/app/views/settings/lookups/index.html.erb index f427b561..9ac392a5 100644 --- a/app/views/settings/lookups/index.html.erb +++ b/app/views/settings/lookups/index.html.erb @@ -18,9 +18,9 @@ <%= settings_lookup.lookup_type %> <%= settings_lookup.name %> <%= settings_lookup.value %> - <%= link_to 'Show', settings_lookup %> + <%= link_to 'Show', settings_lookup_path(settings_lookup) %> <%= link_to 'Edit', edit_settings_lookup_path(settings_lookup) %> - <%= link_to 'Destroy', settings_lookup, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Destroy', settings_lookup_path(settings_lookup), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 3b647fa9..cfaec2d0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,7 +88,7 @@ Rails.application.routes.draw do get "/:id/discount" => "discounts#index" post "/:id/discount" => "discounts#create" - post "/:id/request_bills" => "request_bills#print" ,:defaults => { :format => 'json' } + post "/:id/request_bills" => "request_bills#print",:as => "request_bill" ,:defaults => { :format => 'json' } get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' @@ -217,8 +217,8 @@ Rails.application.routes.draw do #--------- Reports Controller Sections ------------# namespace :reports do resources :receipt_no, :only => [:index, :show] - resources :daily_sale, :only => [:index, :show] - resources :sale_item, :only => [:index, :show] + resources :daily_sales, :only => [:index, :show] + resources :sale_items, :only => [:index, :show] # resources :sales, :only => [:index, :show] # resources :orders, :only => [:index, :show] # resources :customers, :only => [:index, :show] diff --git a/spec/controllers/reports/daily_sales_controller_spec.rb b/spec/controllers/reports/daily_sales_controller_spec.rb new file mode 100644 index 00000000..6cc8e9fd --- /dev/null +++ b/spec/controllers/reports/daily_sales_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Reports::DailySalesController, type: :controller do + +end diff --git a/spec/controllers/reports/dailysales_controller_spec.rb b/spec/controllers/reports/dailysales_controller_spec.rb new file mode 100644 index 00000000..83fcb321 --- /dev/null +++ b/spec/controllers/reports/dailysales_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Reports::DailysalesController, type: :controller do + +end diff --git a/spec/controllers/reports/sale_items_controller_spec.rb b/spec/controllers/reports/sale_items_controller_spec.rb new file mode 100644 index 00000000..546fc874 --- /dev/null +++ b/spec/controllers/reports/sale_items_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Reports::SaleItemsController, type: :controller do + +end diff --git a/spec/helpers/reports/daily_sales_helper_spec.rb b/spec/helpers/reports/daily_sales_helper_spec.rb new file mode 100644 index 00000000..17d70035 --- /dev/null +++ b/spec/helpers/reports/daily_sales_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Reports::DailySalesHelper. For example: +# +# describe Reports::DailySalesHelper 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 Reports::DailySalesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/reports/dailysales_helper_spec.rb b/spec/helpers/reports/dailysales_helper_spec.rb new file mode 100644 index 00000000..96853812 --- /dev/null +++ b/spec/helpers/reports/dailysales_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Reports::DailysalesHelper. For example: +# +# describe Reports::DailysalesHelper 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 Reports::DailysalesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/reports/sale_items_helper_spec.rb b/spec/helpers/reports/sale_items_helper_spec.rb new file mode 100644 index 00000000..ea2807c4 --- /dev/null +++ b/spec/helpers/reports/sale_items_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Reports::SaleItemsHelper. For example: +# +# describe Reports::SaleItemsHelper 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 Reports::SaleItemsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From 19528b189f79b5edffc81664a91b039acde603f5 Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 23 Jun 2017 09:50:37 +0630 Subject: [PATCH 068/128] Update --- app/views/origami/home/show.html.erb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 1652c675..781f925b 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -142,7 +142,7 @@ sub_total = sub_total + sale_item.price %> - <% + <% # Can't check for discount unless sale_item.price == 0 %> @@ -259,22 +259,22 @@ <% if @dining.bookings.length >= 1 %> - - - <% if @status_order == 'order' && @status_sale != 'sale' %> - - - - - <% else %> + + + + + + + <% else %> + + - - - + + <% end %> @@ -313,7 +313,7 @@ $(document).ready(function(){ var sale_id = $('#save_order_id').attr('data-order'); } - window.location.href = '/origami/'+ sale_id + "/customers" + window.location.href = '/origami/'+ sale_id + "/customers" }); // Discount for Payment @@ -324,7 +324,7 @@ $(document).ready(function(){ }else{ var sale_id = $('#save_order_id').attr('data-order'); } - + if(sale_id!=""){ window.location.href = '/origami/' + sale_id + '/discount' } From 62156e2e3e72ee4813a0b3c027b91cfc749d82c4 Mon Sep 17 00:00:00 2001 From: Phyo Date: Fri, 23 Jun 2017 11:13:29 +0630 Subject: [PATCH 069/128] Employee Show --- app/views/settings/employees/index.html.erb | 2 +- app/views/settings/employees/show.html.erb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/settings/employees/index.html.erb b/app/views/settings/employees/index.html.erb index e680eb91..1112f72b 100644 --- a/app/views/settings/employees/index.html.erb +++ b/app/views/settings/employees/index.html.erb @@ -22,7 +22,7 @@ <% @employees.each do |employee| %> - <%= link_to employee.name, employee[:setting] %> + <%= 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?' } %> diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb index 084887dc..753298e6 100644 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -9,3 +9,8 @@ Role: <%= @employee.role %>

      + +

      + Employee ID: + <%= @employee.emp_id %> +

      From 68403617a510b1f858e56cf67605d0c0ad629af6 Mon Sep 17 00:00:00 2001 From: Phyo Date: Fri, 23 Jun 2017 11:14:48 +0630 Subject: [PATCH 070/128] Change Font and show status in origami --- app/assets/stylesheets/origami.scss | 4 +++- app/views/origami/home/show.html.erb | 10 ++++++++++ app/views/origami/orders/show.html.erb | 10 ++++++++++ app/views/origami/rooms/show.html.erb | 14 ++++++++++++-- app/views/origami/sales/show.html.erb | 10 ++++++++++ 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 2670dcc4..d6588a94 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -9,6 +9,8 @@ // min-height: 75rem; // padding-top: 4.5rem; // } +.card-columns { + font-size: 18px !important;} .others-payment{ line-height:100px; @@ -186,4 +188,4 @@ tr.discount-item-row:hover { .jconfirm-box-container{ margin-left:-40px !important -} \ No newline at end of file +} diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 50d13fe4..f92fa1c4 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -41,6 +41,11 @@
      <%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> @@ -62,6 +67,11 @@
      <%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index 0763c43f..92ffc7f1 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -41,6 +41,11 @@
      <%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> @@ -62,6 +67,11 @@
      <%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 4f15eea5..6430c83c 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -41,6 +41,11 @@
      <%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> @@ -62,6 +67,11 @@
      <%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> @@ -269,7 +279,7 @@ $(document).ready(function(){ var sale_id = $('#save_order_id').attr('data-order'); } - window.location.href = '/origami/'+ sale_id + "/customers" + window.location.href = '/origami/'+ sale_id + "/customers" }); // Discount for Payment @@ -280,7 +290,7 @@ $(document).ready(function(){ }else{ var sale_id = $('#save_order_id').attr('data-order'); } - + if(sale_id!=""){ window.location.href = '/origami/' + sale_id + '/discount' } diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 5f3056fb..cd716052 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -41,6 +41,11 @@
      <%= table.name %> + <% if table.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> @@ -62,6 +67,11 @@
      <%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %>
      <% else %> From 55c8ab80dad3c4a09cbe2c70eb05f338d7e7f532 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 23 Jun 2017 11:40:11 +0630 Subject: [PATCH 071/128] discount updated --- app/views/origami/discounts/index.html.erb | 76 +++++++++++++++++++--- app/views/origami/payments/show.html.erb | 1 - app/views/origami/rooms/show.html.erb | 2 +- 3 files changed, 69 insertions(+), 10 deletions(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 4e4d2b77..e2b86569 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -80,7 +80,7 @@ -
      +
      @@ -167,14 +167,23 @@
      - - + +
      + + +
      + +
      + + +
      +
      +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.references :dining_facility, foreign_key: true + + t.timestamps + end + end +end diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2719a758..e282f367 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -116,9 +116,11 @@

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

      -
      + +
      -

      Customer :

      + +

      Customer : <%= @customer.name %>

      @@ -276,23 +278,39 @@ diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index c1797158..b188d086 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -97,11 +97,18 @@
      - <% if @status == "order" %> + + + <% if @status == 'order' %> +
      ORDER DETAILS
      + <% elsif @status_sale == 'sale' %> +
      INVOICE DETAILS
      <% end %> +
      @@ -118,7 +125,8 @@
      -

      Customer :

      + +

      Customer : <%= @customer.name %>

      @@ -244,22 +252,49 @@ diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 04343380..b62289b1 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -110,14 +110,14 @@   - Pay Amount + Total Pay Amount <%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%> <% @sale_receivables.each do |r|%> - Payment <%= r.payment_method rescue ' '%> + <%= r.payment_method.capitalize rescue ' '%> Payment <%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%> diff --git a/config/routes.rb b/config/routes.rb index 3b647fa9..ae3a0022 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -111,7 +111,7 @@ Rails.application.routes.draw do #---------Add Customer --------------# #resources :customers get '/:sale_id/customers', to: "customers#add_customer" - get '/:customer_id/get_customer' => 'home#get_customer' + get '/:customer_id/get_customer' => 'home#get_customer',:as => "show_customer_details" post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer"#update customer id in sale table end diff --git a/db/migrate/20170617163811_create_dining_queues.rb b/db/migrate/20170623101708_create_dining_queues.rb similarity index 86% rename from db/migrate/20170617163811_create_dining_queues.rb rename to db/migrate/20170623101708_create_dining_queues.rb index d4b3eacd..dd2ea134 100644 --- a/db/migrate/20170617163811_create_dining_queues.rb +++ b/db/migrate/20170623101708_create_dining_queues.rb @@ -6,7 +6,8 @@ class CreateDiningQueues < ActiveRecord::Migration[5.1] t.string :queue_no t.string :status t.references :dining_facility, foreign_key: true - + t.integer :seater + t.string :remark t.timestamps end end From 3a0e26b2eaca85985c80e0af28caded2003cef9d Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 23 Jun 2017 17:05:08 +0630 Subject: [PATCH 073/128] accounts and discount updated --- app/controllers/api/bill_controller.rb | 7 ++- app/controllers/oqs/home_controller.rb | 28 ++++++++++- .../origami/discounts_controller.rb | 7 ++- .../origami/payments_controller.rb | 10 ++-- .../origami/request_bills_controller.rb | 8 +-- app/models/order_queue_station.rb | 17 ++++--- app/models/printer/receipt_printer.rb | 4 +- app/models/sale_item.rb | 23 +++++++-- app/models/sale_payment.rb | 2 +- app/pdf/order_item_pdf.rb | 2 +- app/pdf/order_summary_pdf.rb | 2 +- app/pdf/queue_no_pdf.rb | 2 +- app/pdf/receipt_bill_pdf.rb | 50 +++++++++---------- app/views/origami/discounts/index.html.erb | 11 +++- 14 files changed, 114 insertions(+), 59 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 86d50556..09d75f70 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -34,12 +34,11 @@ class Api::BillController < Api::ApiController # 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(@sale_items) + # Calculate Price by accounts + item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total) + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts) end diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 18971247..64fd840d 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -82,7 +82,33 @@ class Oqs::HomeController < BaseOqsController end # Query for OQS with delivery status - def queue_items_query(status) + def queue_items_query(status) + # queue_items = [] + # AssignedOrderItem.all.each do |aoi| + # oqs = OrderQueueStation.find(aoi.order_queue_station_id) + # order = Order.find(aoi.order_id) + # order_items = OrderItem.find_by_order_id(aoi.order_id) + # booking_orders = BookingOrder.find_by_order_id(aoi.order_id) + # booking = Booking.find(booking_orders.booking_id) + # dining = DiningFacility.find(booking.dining_facility_id) + # customer = Customer.find_by_customer_id(order.customer_id) + # queue_item = { + # :assigned_order_item_id => aoi.assigned_order_item_id, + # :station_name => oqs.station_name, + # :is_active => oqs.is_active, + # :zone => dining.name, + # :item_code => aoi.item_code, + # :item_name => order_items.item_name, + # :price => order_items.price, + # :qty => order_items.qty, + # :item_order_by => order_items.item_order_by, + # :options => order_items.options, + # :customer_name => customer.name, + # :created_at => order_items.created_at + # } + # queue_items.push(queue_item) + # end + # return queue_items 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, odt.options, cus.name as customer_name, odt.created_at") .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id left join orders as od ON od.order_id = assigned_order_items.order_id diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 6c0a4c8d..73038556 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -19,6 +19,8 @@ class Origami::DiscountsController < BaseOrigamiController if Sale.exists?(sale_id) sale = Sale.find(sale_id) + table_id = sale.bookings[0].dining_facility_id + table_type = DiningFacility.find(table_id).type sale.total_discount = overall_discount.to_f sale.total_amount = sub_total.to_f sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax; @@ -44,7 +46,10 @@ class Origami::DiscountsController < BaseOrigamiController sale_item.save end end - end + end + + dining = {:table_id => table_id, :table_type => table_type } + render :json => dining.to_json end #discount for selected order diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 38225fae..00abc9aa 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -23,10 +23,10 @@ class Origami::PaymentsController < BaseOrigamiController # 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) + item_price_by_accounts = SaleItem.calculate_price_by_accounts(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,rebate_amount) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount) end end @@ -94,11 +94,11 @@ class Origami::PaymentsController < BaseOrigamiController # 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) + # Calculate price_by_accounts + item_price_by_accounts = SaleItem.calculate_price_by_accounts(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,rebate_amount) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount) end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 93453ffc..95f63e58 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -24,19 +24,19 @@ class Origami::RequestBillsController < BaseOrigamiController customer= Customer.find(@sale_data.customer_id) # get member information - member_info = Customer.get_member_account(customer) + member_info = Customer.get_member_account(customer) # 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) + # Calculate price_by_accounts + item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total,member_info) + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info) # redirect_to origami_path(@sale_data.sale_id) end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 2e85ecde..04619379 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -18,14 +18,15 @@ class OrderQueueStation < ApplicationRecord order_items = order.order_items # get dining - booking = Booking.find_by_dining_facility_id(dining.id) + booking = Booking.find_by_dining_facility_id(dining.id) #Assign OQS id to order Items - oqs_stations.each do |oqs| + oqs_stations.each do |oqs| + is_auto_printed = false #Get List of items - pq_items = JSON.parse(oqs.processing_items) - #Loop through the processing items + #Loop through the processing items pq_items.each do |pq_item| #Processing through the looping items order_items.each do |order_item| @@ -36,11 +37,13 @@ class OrderQueueStation < ApplicationRecord # else AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - # end - - if oqs.auto_print + # end + + # Auto Printing + if oqs.auto_print && is_auto_printed == false print_slip(oqs, order, order_items) - end + is_auto_printed = true + end end end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 969b9d44..4b7287db 100644 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -65,11 +65,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Bill Receipt Print - def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, food_total, beverage_total, member_info = nil,rebate_amount=nil) + def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount=nil) #Use CUPS service #Generate PDF #Print - pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total, member_info,rebate_amount) + pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info,rebate_amount) pdf.render_file "tmp/receipt_bill.pdf" self.print("tmp/receipt_bill.pdf") diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index bec8b5c5..8881efea 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -30,9 +30,24 @@ class SaleItem < ApplicationRecord # end end - # Calculate food total and beverage total - def self.calculate_food_beverage(sale_items) + def self.calculate_price_by_accounts(sale_items) + price_accounts = [] + Account.all.each do |a| + account_price = {:name => a.title, :price => 0} + sale_items.each do |si| + if si.account_id == a.id + account_price[:price] = account_price[:price] + si.price + end + end + price_accounts.push(account_price) + end + + return price_accounts + end + + # Calculate rebate_by_account + def self.calculate_rebate_by_account(sale_items) rebateacc = Account.where("rebate=?",true) puts "Account that can rebate" rebateacc.each do |i| @@ -40,7 +55,7 @@ class SaleItem < ApplicationRecord end prices=0 sale_items.each do |si| - price = self.get_price(si.sale_item_id,rebateacc) + price = self.get_rebate_price(si.sale_item_id,rebateacc) prices = prices + price end @@ -48,7 +63,7 @@ class SaleItem < ApplicationRecord end # get food price or beverage price for item - def self.get_price(sale_item_id,rebateacc) + def self.get_rebate_price(sale_item_id,rebateacc) price=0 item=SaleItem.select("sale_items.price , menu_items.account_id") diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index f988b4e3..950334cb 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -265,7 +265,7 @@ class SalePayment < ApplicationRecord end def rebat(sObj) - rebate_prices = SaleItem.calculate_food_beverage(sObj.sale_items) + rebate_prices = SaleItem.calculate_rebate_by_account(sObj.sale_items) puts "eeeeeeeeeeeeeeeeeeeeeeee" puts rebate_prices generic_customer_id = sObj.customer.membership_id diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 749a8a16..4b7559b1 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -2,7 +2,7 @@ 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, print_status, options) self.page_width = 210 - self.page_height = 2500 + self.page_height = 1450 self.margin = 5 self.price_width = 40 # No Need for item self.qty_width = 30 diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index b9c1f6fe..176749b8 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -2,7 +2,7 @@ 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, print_status) self.page_width = 210 - self.page_height = 2500 + self.page_height = 1450 self.margin = 5 self.price_width = 40 # No Need for item self.qty_width = 30 diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb index 704dbfdb..0963f55e 100644 --- a/app/pdf/queue_no_pdf.rb +++ b/app/pdf/queue_no_pdf.rb @@ -2,7 +2,7 @@ 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.page_height = 1450 self.margin = 5 self.price_width = 35 self.qty_width = 20 diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index bdeb58a3..96e16cf4 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,6 +1,6 @@ class ReceiptBillPdf < 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, sale_items, sale_data, customer_name, food_total, beverage_total, member_info = nil,rebate_amount = nil) + def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil) self.page_width = 210 self.page_height = 2500 self.margin = 5 @@ -29,7 +29,8 @@ class ReceiptBillPdf < Prawn::Document stroke_horizontal_rule cashier_info(sale_data, customer_name) - line_items(sale_items, food_total, beverage_total) + line_items(sale_items) + items_account(item_price_by_accounts) all_total(sale_data) @@ -103,26 +104,24 @@ class ReceiptBillPdf < Prawn::Document move_down 5 end - def line_items(sale_items, food_total, beverage_total) + def line_items(sale_items) y_position = cursor pad_top(15) { - # @item_width.to_i + @half_qty.to_i - 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+4),y_position], :width => self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - - } + # @item_width.to_i + @half_qty.to_i + 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+4),y_position], :width => self.total_width+3, :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, food_total, beverage_total) - + add_line_item_row(sale_items) end - def add_line_item_row(sale_items, food_total, beverage_total) + def add_line_item_row(sale_items) item_name_width = (self.item_width+self.price_width) y_position = cursor move_down 5 @@ -155,25 +154,26 @@ class ReceiptBillPdf < Prawn::Document 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 + end + move_down 5 + end + def items_account(item_price_by_accounts) 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 + item_price_by_accounts.each do |ipa| + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ ipa[:price] }" , :size => self.item_font_size,:align => :right + end + move_down 5 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 diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index e2b86569..45ab4b2b 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -347,9 +347,16 @@ $(document).ready(function(){ type: "POST", url: ajax_url, data: params, - success:function(result){ + success:function(result){ alert("Successfully Discount!"); - window.history.back(); + if(result.table_type == "Table"){ + window.location.href = "/origami/table/" + result.table_id + } + else { + window.location.href = "/origami/room/" + result.table_id + } + + // window.history.back(); } }); }); From 81c50f220a04391eda0a88257526fa01234a573b Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 23 Jun 2017 17:37:08 +0630 Subject: [PATCH 074/128] edit invoice --- Gemfile | 2 +- app/assets/stylesheets/origami.scss | 7 +- .../origami/payments_controller.rb | 5 +- .../origami/sale_edit_controller.rb | 8 ++ app/models/dining_facility.rb | 2 - app/views/origami/home/show.html.erb | 14 +- app/views/origami/sale_edit/edit.html.erb | 120 ++++++++++++++++++ config/routes.rb | 2 +- 8 files changed, 150 insertions(+), 10 deletions(-) create mode 100644 app/controllers/origami/sale_edit_controller.rb create mode 100644 app/views/origami/sale_edit/edit.html.erb diff --git a/Gemfile b/Gemfile index 22275707..227cfa72 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -# gem 'pg' +gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 2670dcc4..ae4a3181 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -128,6 +128,11 @@ text-align: right; } +.item-attr-edit{ + width: 10%; + text-align: left; +} + .display-none{ display: none; } @@ -186,4 +191,4 @@ tr.discount-item-row:hover { .jconfirm-box-container{ margin-left:-40px !important -} \ No newline at end of file +} diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 38225fae..c063d935 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -11,7 +11,7 @@ class Origami::PaymentsController < BaseOrigamiController saleObj = Sale.find(sale_id) sale_payment = SalePayment.new sale_payment.process_payment(saleObj, @user, cash, "cash") - + rebate_amount = nil unique_code = "ReceiptBillPdf" @@ -53,7 +53,8 @@ class Origami::PaymentsController < BaseOrigamiController response["data"].each do |res| if res["accountable_type"] == "RebateAccount" @balance = res["balance"] - @accountable_type = res["accountable_type"] + # @accountable_type = res["accountable_type"] + @accountable_type = "Rebate Balance" end end end diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb new file mode 100644 index 00000000..93e98d03 --- /dev/null +++ b/app/controllers/origami/sale_edit_controller.rb @@ -0,0 +1,8 @@ +class Origami::SaleEditController < BaseOrigamiController + + def edit + sale_id = params[:sale_id] + @table_id = params[:table_id] + @saleobj = Sale.find(sale_id) + end +end diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index f8cb639c..0e10307b 100644 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -20,8 +20,6 @@ class DiningFacility < ApplicationRecord def get_booking booking = self.get_current_booking - puts "is bookig?" - puts booking if booking if booking.dining_facility_id.to_i == self.id if booking.booking_status == 'assign' diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index d0b53858..0974e7da 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -260,17 +260,19 @@ <% if @dining.bookings.length >= 1 %> - + <% if @status_order == 'order' && @status_sale != 'sale' %> - + + <% else %> - + + @@ -382,4 +384,10 @@ $('#add_invoice').on('click',function(){ } }); }) + +$('#edit').on('click',function(){ + var dining_id = "<%= @dining.id %>" + var sale_id = "<%= @obj_sale.sale_id rescue "" %>" + window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit"; +}) diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb new file mode 100644 index 00000000..f04561e0 --- /dev/null +++ b/app/views/origami/sale_edit/edit.html.erb @@ -0,0 +1,120 @@ +
      + +
      +
      +
      +
      INVOICE DETAILS
      +
      +
      +
      +
      +

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

      +
      +
      +

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

      +
      +
      +
      +
      +

      Customer :

      +
      + +
      +
      + + + + + + + + + + <% + count = 0 + sub_total = 0 + @saleobj.sale_items.each do |sale_item| + count += 1 + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + unless sale_item.price == 0 + %> + + + + + + + + <% + end + end + %> + +
      #ItemsQTY + Price + Action
      <%= count %><%= sale_item.product_name %> +
      +
      +
      + + + + + + + + + + + + + + + + + + +
      Sub Total:<%= sub_total %>
      Discount:(<%= @saleobj.total_discount rescue 0%>)
      Tax:<%= @saleobj.total_tax rescue 0%>
      Grand Total:<%= @saleobj.grand_total rescue 0%>
      +
      +
      +
      +
      + + +
      + + +
      +
      + diff --git a/config/routes.rb b/config/routes.rb index 0bf24ce7..20b87fd1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -76,7 +76,7 @@ Rails.application.routes.draw do resources :customers #add customer type end post 'moving' => "movetable#moving" - + get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit" get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" get 'sale/:sale_id' => 'sales#show' From 6a6c629da4ad1822e1f8a9e4fa7ca909074482c1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 23 Jun 2017 17:56:09 +0630 Subject: [PATCH 075/128] update cancan alert message --- app/views/layouts/application.html.erb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1d4991e6..d2b57a7a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,7 +18,16 @@ <%= render 'layouts/header' %>
      <% flash.each do |type, message| %> -
      + <% + if type== "warning" + alert = "alert-warning" + elsif type== "notice" + alert = "alert-success" + else + alert = "alert-danger" + end + %> +
      <%= message %>
      From 05b4dbac7c70bb7987bf52589a4dce7546fcf61a Mon Sep 17 00:00:00 2001 From: Phyo Date: Fri, 23 Jun 2017 18:45:15 +0630 Subject: [PATCH 076/128] Rebate Redeem add field --- app/models/sale_payment.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 950334cb..65fc96b0 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -54,7 +54,7 @@ class SalePayment < ApplicationRecord #record an payment in sale-audit 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.save else #record an payment in sale-audit @@ -94,10 +94,15 @@ class SalePayment < ApplicationRecord sale_data = Sale.find_by_sale_id(sale_id) if sale_data + others = 0 + sale_data.sale_payments.each do |sale_payment| + others = others + sale_payment.payment_amount + end + redeem_prices = sale_data.grand_total -others # Control for Paypar Cloud begin 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, + :body => { generic_customer_id:membership_id,total_amount: redeem_prices,total_sale_transaction_amount: sale_data.grand_total,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' @@ -292,7 +297,7 @@ class SalePayment < ApplicationRecord # Control for Paypar Cloud begin - 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, + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_sale_transaction_amount: sObj.grand_total,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', From ecabed5d5d05cc893238a59aaea2f1c8f90a807c Mon Sep 17 00:00:00 2001 From: Phyo Date: Fri, 23 Jun 2017 18:45:46 +0630 Subject: [PATCH 077/128] Account type change --- db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index fc3e1bde..dced96dd 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -73,8 +73,8 @@ booking_status = Lookup.create([{lookup_type:'booking_status', name: 'Available' {lookup_type:'booking_status', name: 'Moved', value: 'moved'}]) #booking_status -account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value: 'income'}, - {lookup_type:'account_type', name: 'Expense', value: 'expense'}]) +account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value: '0'}, + {lookup_type:'account_type', name: 'Expense', value: '1'}]) # sale void reason void_reason = Lookup.create([{lookup_type:'void_reason', name: 'Approve By Manager', value: 'Approve By Manager'}, From e9fb90d8a09443f87268f20d274d5133cc897027 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 23 Jun 2017 19:00:49 +0630 Subject: [PATCH 078/128] updating oqs --- app/assets/javascripts/OQS.js | 4 ++++ app/assets/stylesheets/OQS.scss | 6 ++++++ app/views/oqs/home/index.html.erb | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 4c8300e2..0574148b 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -67,6 +67,10 @@ $(document).ready(function(){ $(this).addClass('selected-item'); }); + $(".order-item-edit").on('click', function(){ + + }); + // complete for queue item $('.order-complete').on('click',function(e){ //e.preventDefault(); diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index b516836a..57c5a36d 100644 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -19,3 +19,9 @@ color: #fff !important; background-color: blue; } + +.order-item { + width: 49%; + font-size: 18px; + margin: 0px 0px 5px 0px; +} \ No newline at end of file diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 85858a02..ce82cbfa 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -116,8 +116,9 @@
      -
      - +
      + +
      <% From 9ed6b510c45b127eeea5f57f0bfde471d7d389d9 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 23 Jun 2017 19:01:33 +0630 Subject: [PATCH 079/128] updating oqs --- app/controllers/oqs/edit_controller.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/controllers/oqs/edit_controller.rb diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb new file mode 100644 index 00000000..e69de29b From 1f6a0eb1f6813e36c776d0e2ec7018e3394eeac6 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 23 Jun 2017 19:20:00 +0630 Subject: [PATCH 080/128] fix with merge --- Gemfile | 2 +- app/controllers/crm/customers_controller.rb | 2 +- app/controllers/origami/home_controller.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 227cfa72..8f16e924 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -gem 'pg' +#gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index ca1aafb2..43b0618e 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -168,7 +168,7 @@ end 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, - :timeout 10 + :timeout => 10 ) rescue Net::OpenTimeout response = { status: false } diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 4a070788..c4edcc0b 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -30,6 +30,7 @@ class Origami::HomeController < BaseOrigamiController order.order_items.each do |item| @order_items.push(item) end + end end @status_order = 'order' else From d9c53e73f85be90df3fea3195c2bb7224f1b5e4d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sat, 24 Jun 2017 11:12:30 +0630 Subject: [PATCH 081/128] update customer --- app/controllers/crm/customers_controller.rb | 2 +- app/controllers/origami/home_controller.rb | 1 + app/pdf/receipt_bill_pdf.rb | 4 ++-- app/views/origami/home/show.html.erb | 2 +- app/views/origami/orders/show.html.erb | 2 +- app/views/origami/rooms/show.html.erb | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index ca1aafb2..43b0618e 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -168,7 +168,7 @@ end 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, - :timeout 10 + :timeout => 10 ) rescue Net::OpenTimeout response = { status: false } diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 4a070788..c4edcc0b 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -30,6 +30,7 @@ class Origami::HomeController < BaseOrigamiController order.order_items.each do |item| @order_items.push(item) end + end end @status_order = 'order' else diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 96e16cf4..5a86ddfb 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -93,10 +93,10 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do - text "Time In: #{ sale_data.bookings[0].checkin_at.strftime('%I:%M %p') }", :size => self.item_font_size,:align => :left + text "Time In: #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') }", :size => self.item_font_size,:align => :left end bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do - text "Time Out: #{ sale_data.bookings[0].checkout_at.strftime('%I:%M %p') }" , :size => self.item_font_size,:align => :right + text "Time Out: #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') }" , :size => self.item_font_size,:align => :right end move_down 5 diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 73f298ec..06263bed 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -292,7 +292,7 @@ <% end %> - + <% end %>
      diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index 92ffc7f1..d2c065a1 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -189,7 +189,7 @@ <% if @sale_status != 'completed' %> <% end %> - +
      -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.references :dining_facility, foreign_key: true - t.timestamps - end - end -end From 6e49f91b89ccb2e3885d27bf484280baeb6e88d3 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 26 Jun 2017 11:10:49 +0630 Subject: [PATCH 086/128] Multiple Invoices Phase 1 --- .../origami/room_invoices_controller.rb | 40 +++++ .../origami/table_invoices_controller.rb | 40 +++++ app/views/origami/home/show.html.erb | 20 ++- .../origami/room_invoices/index.html.erb | 82 ++++++++++ app/views/origami/room_invoices/show.html.erb | 147 ++++++++++++++++++ .../origami/table_invoices/index.html.erb | 82 ++++++++++ .../origami/table_invoices/show.html.erb | 147 ++++++++++++++++++ config/routes.rb | 6 + 8 files changed, 557 insertions(+), 7 deletions(-) create mode 100644 app/controllers/origami/room_invoices_controller.rb create mode 100644 app/controllers/origami/table_invoices_controller.rb create mode 100644 app/views/origami/room_invoices/index.html.erb create mode 100644 app/views/origami/room_invoices/show.html.erb create mode 100644 app/views/origami/table_invoices/index.html.erb create mode 100644 app/views/origami/table_invoices/show.html.erb diff --git a/app/controllers/origami/room_invoices_controller.rb b/app/controllers/origami/room_invoices_controller.rb new file mode 100644 index 00000000..8d805771 --- /dev/null +++ b/app/controllers/origami/room_invoices_controller.rb @@ -0,0 +1,40 @@ +class Origami::RoomInvoicesController < BaseOrigamiController + def index + @room = DiningFacility.find(params[:room_id]) + puts "room bookig lenght" + @sale_array = Array.new + @room.bookings.each do |booking| + puts booking.sale_id + + if booking.sale_id.nil? + else + sale = Sale.find(booking.sale_id) + + if sale.sale_status != "completed" + @sale_array.push(sale) + end + end + end + end + + def show + @room = DiningFacility.find(params[:room_id]) + @sale_array = Array.new + @room.bookings.each do |booking| + if booking.sale_id.nil? + else + sale = Sale.find(booking.sale_id) + + if sale.sale_status != "completed" + @sale_array.push(sale) + end + end + end + + @sale = Sale.find(params[:invoice_id]) + @date = @sale.created_at + @status_sale = 'sale' + @customer = @sale.customer + end + +end diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb new file mode 100644 index 00000000..32e0ef7f --- /dev/null +++ b/app/controllers/origami/table_invoices_controller.rb @@ -0,0 +1,40 @@ +class Origami::TableInvoicesController < BaseOrigamiController + def index + @table = DiningFacility.find(params[:table_id]) + puts "table bookig lenght" + @sale_array = Array.new + @table.bookings.each do |booking| + puts booking.sale_id + + if booking.sale_id.nil? + else + sale = Sale.find(booking.sale_id) + + if sale.sale_status != "completed" + @sale_array.push(sale) + end + end + end + end + + def show + @table = DiningFacility.find(params[:table_id]) + @sale_array = Array.new + @table.bookings.each do |booking| + if booking.sale_id.nil? + else + sale = Sale.find(booking.sale_id) + + if sale.sale_status != "completed" + @sale_array.push(sale) + end + end + end + + @sale = Sale.find(params[:invoice_id]) + @date = @sale.created_at + @status_sale = 'sale' + @customer = @sale.customer + end + +end diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 73f298ec..c25c1b2f 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -126,7 +126,7 @@

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

      - +
      @@ -241,18 +241,18 @@ %> - <% - end - @sale_array.each do |sale| + <% end %> +

      + Pending Payment + <% @sale_array.each do |sale| if @sale_array.size > 1 unless sale.receipt_no == @sale_array[0].receipt_no %> -

      - Pending Payment + - +
      Receipt No - <%= sale.receipt_no %>
      <% @@ -298,6 +298,11 @@
      diff --git a/app/views/origami/room_invoices/index.html.erb b/app/views/origami/room_invoices/index.html.erb new file mode 100644 index 00000000..011aff11 --- /dev/null +++ b/app/views/origami/room_invoices/index.html.erb @@ -0,0 +1,82 @@ +
      +
      + <% @sale_array.each do |sale| %> +
      +
      + <%= sale.receipt_no %> +
      +
      + <% end %> +
      + + +
      +
      +
      +
      INVOICE DETAILS
      +
      +
      +
      +
      +

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

      +
      +
      +

      Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      +
      +
      +
      +
      +

      Customer :

      +
      + +
      + +
      + + + + + + + + + + + + + + + + + + +
      Sub Total:
      Discount:(<%= @sale.total_discount rescue 0%>)
      Tax:<%= @sale.total_tax rescue 0%>
      Grand Total:<%= @sale.grand_total rescue 0%>
      +
      +
      +
      +
      + + +
      + + +
      +
      + diff --git a/app/views/origami/room_invoices/show.html.erb b/app/views/origami/room_invoices/show.html.erb new file mode 100644 index 00000000..46e9a892 --- /dev/null +++ b/app/views/origami/room_invoices/show.html.erb @@ -0,0 +1,147 @@ +
      +
      + + <% @sale_array.each do |sale| %> +
      + <% if sale.id == @sale.id %> +
      + <%= sale.receipt_no %> +
      + <% else %> +
      + <%= sale.receipt_no %> +
      + <% end %> +
      + <% end %> +
      + +
      +
      +
      +
      INVOICE DETAILS
      +
      +
      +
      +
      +

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

      +
      +
      +

      Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      +
      +
      +
      +
      + + +

      Customer : <%= @customer.name %>

      + +
      + +
      +
      + + + + + + + + + <% + count = 0 + sub_total = 0 + if @status_sale == "sale" + @sale.sale_items.each do |sale_item| + count += 1 + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + unless sale_item.price == 0 + %> + + + + + + + <% + end + end + end + + if @status_order == 'order' && @status_sale != 'sale' + unless @order_items.nil? + count = 0 + @order_items.each do |order_item | + count += 1 + sub_total = sub_total + order_item.price + + unless order_item.price == 0 %> + + + + + + + <% + end + end + end + end + %> + +
      #ItemsQTY + Price +
      <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
      <%= count %><%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
      +
      +
      + + + + + + + + + + + + + + + + + + +
      Sub Total:<%= sub_total %>
      Discount:(<%= @sale.total_discount rescue 0%>)
      Tax:<%= @sale.total_tax rescue 0%>
      Grand Total:<%= @sale.grand_total rescue 0%>
      +
      +
      +
      +
      + + +
      + + +
      +
      + diff --git a/app/views/origami/table_invoices/index.html.erb b/app/views/origami/table_invoices/index.html.erb new file mode 100644 index 00000000..d5cbe84d --- /dev/null +++ b/app/views/origami/table_invoices/index.html.erb @@ -0,0 +1,82 @@ +
      +
      + <% @sale_array.each do |sale| %> +
      +
      + <%= sale.receipt_no %> +
      +
      + <% end %> +
      + + +
      +
      +
      +
      INVOICE DETAILS
      +
      +
      +
      +
      +

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

      +
      +
      +

      Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      +
      +
      +
      +
      +

      Customer :

      +
      + +
      + +
      + + + + + + + + + + + + + + + + + + +
      Sub Total:
      Discount:(<%= @sale.total_discount rescue 0%>)
      Tax:<%= @sale.total_tax rescue 0%>
      Grand Total:<%= @sale.grand_total rescue 0%>
      +
      +
      +
      +
      + + +
      + + +
      +
      + diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb new file mode 100644 index 00000000..065c7f8d --- /dev/null +++ b/app/views/origami/table_invoices/show.html.erb @@ -0,0 +1,147 @@ +
      +
      + + <% @sale_array.each do |sale| %> +
      + <% if sale.id == @sale.id %> +
      + <%= sale.receipt_no %> +
      + <% else %> +
      + <%= sale.receipt_no %> +
      + <% end %> +
      + <% end %> +
      + +
      +
      +
      +
      INVOICE DETAILS
      +
      +
      +
      +
      +

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

      +
      +
      +

      Date: <%= @sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

      +
      +
      +
      +
      + + +

      Customer : <%= @customer.name %>

      + +
      + +
      +
      + + + + + + + + + <% + count = 0 + sub_total = 0 + if @status_sale == "sale" + @sale.sale_items.each do |sale_item| + count += 1 + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + unless sale_item.price == 0 + %> + + + + + + + <% + end + end + end + + if @status_order == 'order' && @status_sale != 'sale' + unless @order_items.nil? + count = 0 + @order_items.each do |order_item | + count += 1 + sub_total = sub_total + order_item.price + + unless order_item.price == 0 %> + + + + + + + <% + end + end + end + end + %> + +
      #ItemsQTY + Price +
      <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
      <%= count %><%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
      +
      +
      + + + + + + + + + + + + + + + + + + +
      Sub Total:<%= sub_total %>
      Discount:(<%= @sale.total_discount rescue 0%>)
      Tax:<%= @sale.total_tax rescue 0%>
      Grand Total:<%= @sale.grand_total rescue 0%>
      +
      +
      +
      +
      + + +
      + + +
      +
      + diff --git a/config/routes.rb b/config/routes.rb index c93beb92..6466b664 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -109,6 +109,12 @@ Rails.application.routes.draw do get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index" get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index" + #---------Multiple Invoices --------------# + get 'table/:table_id/table_invoices' => "table_invoices#index" , :as => "table_invoice_index" + get 'table/:table_id/table_invoice/:invoice_id' => "table_invoices#show" , :as => "table_invoice_show" + get 'room/:room_id/room_invoices' => "room_invoices#index" , :as => "room_invoice_index" + get 'room/:room_id/room_invoice/:invoice_id' => "room_invoices#show" , :as => "room_invoice_show" + #---------Add Customer --------------# #resources :customers get '/:sale_id/customers', to: "customers#add_customer" From a05fc0f6460a564b4dc179bed817b1058ba2c5dc Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 26 Jun 2017 12:55:44 +0630 Subject: [PATCH 087/128] Up to Amount bug fix --- app/views/origami/redeem_payments/index.html.erb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index cbe356b5..a4783010 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -5,7 +5,7 @@
      - +
      @@ -21,7 +21,7 @@ <% end %>
      - +
      @@ -98,6 +98,12 @@
      diff --git a/app/views/origami/sale_edit/item_void_cancel.json.jbuilder b/app/views/origami/sale_edit/item_void_cancel.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/sale_edit/item_void_cancel.json.jbuilder @@ -0,0 +1 @@ +json.status true diff --git a/config/routes.rb b/config/routes.rb index bf5d6483..c295f6be 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -78,6 +78,10 @@ Rails.application.routes.draw do post 'moving' => "movetable#moving" get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit" post 'item_void' => "sale_edit#item_void" + post 'item_void_cancel' => "sale_edit#item_void_cancel" + post 'cancel_all_void' => 'sale_edit#cancel_all_void' + post 'apply_void' => 'sale_edit#apply_void' + get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" get 'sale/:sale_id' => 'sales#show' From d3dc2e2dd8a69130ddcba0e9cd20b3c8e715dca9 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 16:39:55 +0630 Subject: [PATCH 096/128] remove pg in gem --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 227cfa72..8f16e924 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -gem 'pg' +#gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' From 6e77a71946e0cd2d75c867afcd56a3f7ac590173 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 16:50:04 +0630 Subject: [PATCH 097/128] update customer seed shop and receipt bill --- app/controllers/crm/customers_controller.rb | 3 +- .../origami/customers_controller.rb | 4 + app/pdf/receipt_bill_pdf.rb | 82 +++++++-------- app/views/crm/customers/show.html.erb | 99 +++++++------------ app/views/layouts/_header.html.erb | 3 + db/seeds.rb | 3 +- 6 files changed, 81 insertions(+), 113 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 4984150a..213a6229 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -47,7 +47,8 @@ class Crm::CustomersController < BaseCrmController #get customer amount @customer = Customer.find(params[:id]) - @response = Customer.get_membership_transactions(@customer) + @response = Customer.get_membership_transactions(@customer) + # @response = "" #end customer amount end diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index f15b8545..0859694d 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -54,6 +54,10 @@ class Origami::CustomersController < BaseOrigamiController if(id == "SAL") sale = Sale.find(params[:sale_id]) status = sale.update_attributes(customer_id: params[:customer_id]) + sale.sale_orders.each do |sale_order| + order = Order.find(sale_order.order_id) + status = order.update_attributes(customer_id: params[:customer_id]) + end else @booking = BookingOrder.find_by_order_id(params[:sale_id]) @orders = BookingOrder.where("booking_id = ? ", @booking.booking_id) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 5a86ddfb..4689de9d 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -30,7 +30,6 @@ class ReceiptBillPdf < Prawn::Document cashier_info(sale_data, customer_name) line_items(sale_items) - items_account(item_price_by_accounts) all_total(sale_data) @@ -39,6 +38,8 @@ class ReceiptBillPdf < Prawn::Document end customer(customer_name) + + items_account(item_price_by_accounts) footer end @@ -61,19 +62,10 @@ class ReceiptBillPdf < Prawn::Document text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left end bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do - text "#{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right + text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right end move_down 5 - # y_position = cursor - # 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.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.item_width) do text "Waiter: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left @@ -86,27 +78,26 @@ class ReceiptBillPdf < Prawn::Document end move_down 5 - # 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.label_width, :height => self.item_height) do - text "Time In: #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') }", :size => self.item_font_size,:align => :left - end - bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do - text "Time Out: #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') }" , :size => self.item_font_size,:align => :right + bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do + text "Receipt Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left end + + # bounding_box([self.item_description_width,y_position], :width =>self.label_width+5) do + # text "(#{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } + # - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" , + # :size => self.item_font_size,:align => :right + # end + move_down 5 stroke_horizontal_rule - move_down 5 end def line_items(sale_items) + move_down 5 y_position = cursor - + move_down 5 pad_top(15) { # @item_width.to_i + @half_qty.to_i text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix @@ -114,10 +105,8 @@ class ReceiptBillPdf < Prawn::Document 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+4),y_position], :width => self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } - - move_down 5 + move_down -5 stroke_horizontal_rule - add_line_item_row(sale_items) end @@ -142,7 +131,7 @@ class ReceiptBillPdf < Prawn::Document text_box "#{qty}", :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}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } - move_down 3 + move_down 1 end stroke_horizontal_rule @@ -158,20 +147,6 @@ class ReceiptBillPdf < Prawn::Document move_down 5 end - def items_account(item_price_by_accounts) - y_position = cursor - item_price_by_accounts.each do |ipa| - y_position = cursor - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left - end - bounding_box([self.item_description_width,y_position], :width =>self.label_width) do - text "#{ ipa[:price] }" , :size => self.item_font_size,:align => :right - end - move_down 5 - end - end - def all_total(sale_data) item_name_width = self.item_width y_position = cursor @@ -267,7 +242,7 @@ class ReceiptBillPdf < Prawn::Document move_down 5 y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "Rebate Amount", :size => self.item_font_size,:align => :left + text "Current Rebate Amount", :size => self.item_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{ res["rebate"] }" , :size => self.item_font_size,:align => :right @@ -278,10 +253,10 @@ class ReceiptBillPdf < Prawn::Document move_down 5 y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "Redeem Amount", :size => self.item_font_size,:align => :left + text "Current Redeem Amount", :size => self.item_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do - text "#{ res["redeem"] }" , :size => self.item_font_size,:align => :right + text "(#{ res["redeem"] })" , :size => self.item_font_size,:align => :right end end @@ -317,7 +292,23 @@ class ReceiptBillPdf < Prawn::Document end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{ customer_name }" , :size => self.item_font_size,:align => :right - end + end + end + + def items_account(item_price_by_accounts) + move_down 5 + stroke_horizontal_rule + move_down 5 + y_position = cursor + item_price_by_accounts.each do |ipa| + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ ipa[:price] }" , :size => self.item_font_size,:align => :right + end + end end def footer @@ -331,3 +322,4 @@ class ReceiptBillPdf < Prawn::Document end end + diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index c6ec25c2..5c4bf7c8 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -55,7 +55,9 @@
      - <% if @response["status"] == true && $response["data"] != "[]"%> + <% puts "'''''''''''''''''''" + puts @response + if @response["status"] == true %> <% if @response["status"] == true %> @@ -101,28 +103,22 @@
      Membership Transactions
      - - - - - - - - + + + + + - <% @order_items.each do |order_item| %> + <% @orders.each do |order| %> - - - - - - - - + + + + + <% end %> @@ -137,62 +133,33 @@
      Order IDMenu ItemQTYUnit Price OptionStatusWaiterCreated at Order ID TypeOrder statusOrder dateItems Count
      <%= 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") %><%= order.order_id %><%= order.order_type %><%= order.status %><%= order.date.strftime("%d-%m-%Y") %> <%= order.item_count %>
      - - - - - - + + + + + + + - <% @sale_items.each do |sale_item| %> - - - - - - - - - - <% end %> + <% @sales.each do |sale| %> + + + + + + + + + + <% end %>
      Sale ID Menu ItemQTYUnit Price Tax PriceCreated AtSale Id Receipt no Grand totalTax amountCashierSales statusReceipt Date
      <%= sale_item.sale_id %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.unit_price %><%= sale_item.taxable_price %><%= sale_item.created_at %>
      <%= 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") %>
      -
      -

      Sale Details

      -
      - - - - - - - - - - - - - - <% @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/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index c528003d..3d723782 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -49,10 +49,13 @@ <% if current_login_employee %>
        + <%if current_login_employee.role !="waiter" %>
      • <%= current_login_employee.name %>
        • +
      • |
      • <%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
        • + <%end%>
      <% end %> diff --git a/db/seeds.rb b/db/seeds.rb index fc3e1bde..e02ba1d5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -131,7 +131,8 @@ menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size" menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"}) menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) - +shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.3, 23 street', township:"Yankin",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"09 99988888, 0912374734",reservation_no:"111",license:"123", +activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111"}) #Default Order Queue stations # order_queue_station1 = OrderQueueStation.create({station_name: "Queue Station 1", is_active: true,printer_name: "kitchen_printer", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"}) # order_queue_station2 = OrderQueueStation.create({station_name: "Queue Station 2", is_active: true,printer_name: "drink_printer", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"}) From c81663003f78f8622f83b37d2459caf40584aebf Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 17:01:25 +0630 Subject: [PATCH 098/128] update in discount --- app/views/origami/discounts/index.html.erb | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 5f6b1396..e3cca128 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -249,19 +249,24 @@ $(document).ready(function(){ // Select for account types $(".accounts-type").on('click', function(e){ + var account_id = $(this).attr('id').substr(8); + if($(this).hasClass('selected-account') == true){ $(this).removeClass('selected-account'); + $(".item-row").each(function(i){ + if($(this).children().find("#item-account-type").text() == account_id){ + $(this).removeClass("selected-item"); + } + }); } else { $(this).addClass('selected-account'); - } - - var account_id = $(this).attr('id').substr(8); - $(".item-row").each(function(i){ - if($(this).children().find("#item-account-type").text() == account_id){ - $(this).addClass("selected-item"); - } - }); + $(".item-row").each(function(i){ + if($(this).children().find("#item-account-type").text() == account_id){ + $(this).addClass("selected-item"); + } + }); + } }); // Calculate Net Discount for Payment From d4983fabf59c037be91fc58da5d8fdfb77ff55bd Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 26 Jun 2017 17:07:17 +0630 Subject: [PATCH 099/128] item void --- .../origami/sale_edit_controller.rb | 4 +- app/models/sale.rb | 51 ++++++++++++++----- .../sale_edit/apply_void.json.jbuilder | 1 + 3 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 app/views/origami/sale_edit/apply_void.json.jbuilder diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 575cc008..70a5a380 100644 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -51,6 +51,8 @@ class Origami::SaleEditController < BaseOrigamiController end def apply_void - + sale_id = params[:sale_id] + saleObj = Sale.find(sale_id) + saleObj.compute_without_void end end diff --git a/app/models/sale.rb b/app/models/sale.rb index f79d8642..791e9369 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -21,9 +21,9 @@ class Sale < ApplicationRecord "daily" => 0, "monthly" => 1, "yearly" => 2 - } + } - SALE_STATUS_COMPLETED = "completed" + SALE_STATUS_COMPLETED = "completed" def generate_invoice_from_booking(booking_id, requested_by) booking = Booking.find(booking_id) @@ -199,6 +199,31 @@ class Sale < ApplicationRecord end + def compute_without_void + sales_items = self.sale_items + + #Computation Fields + subtotal_price = 0 + total_taxable = 0 + rounding_adjustment = 0 + + sales_items.each do |item| + if item.remark != 'void' + #compute each item and added to total + subtotal_price = subtotal_price + item.price + total_taxable = total_taxable + item.taxable_price + end + end + + apply_tax (total_taxable) + self.total_amount = subtotal_price + self.total_discount = total_discount + self.grand_total = (self.total_amount - self.total_discount) + self.total_tax + #compute rounding adjustment + adjust_rounding + + self.save! + end # Tax Calculate def apply_tax(total_taxable) #if tax is not apply create new record @@ -354,28 +379,28 @@ def self.get_by_range_by_saleitems(from,to,status,report_type) mc.name as menu_category_name, mc.id as menu_category_id ") .group('mi.id') - .order("mi.menu_category_id") - - query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id - JOIN menu_items mi ON i.product_code = mi.item_code" + - " JOIN menu_categories mc ON mc.id = mi.menu_category_id + .order("mi.menu_category_id") + + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id + JOIN menu_items mi ON i.product_code = mi.item_code" + + " JOIN menu_categories mc ON mc.id = mi.menu_category_id JOIN employees ea ON ea.id = sales.cashier_id") - + query = query.where("receipt_date between ? and ? and sale_status=?",from,to,status) - + case report_type.to_i when REPORT_TYPE["daily"] return query when REPORT_TYPE["monthly"] - - return query.group("MONTH(date)") + + return query.group("MONTH(date)") when REPORT_TYPE["yearly"] - return query.group("YEAR(date)") + return query.group("YEAR(date)") end - + end private diff --git a/app/views/origami/sale_edit/apply_void.json.jbuilder b/app/views/origami/sale_edit/apply_void.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/sale_edit/apply_void.json.jbuilder @@ -0,0 +1 @@ +json.status true From 089848ed4a217c026802c8700d39d4e2640bd92b Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 26 Jun 2017 17:49:55 +0630 Subject: [PATCH 100/128] credit note payment --- Gemfile | 2 +- .../origami/credit_payments_controller.rb | 22 +++ .../origami/payments_controller.rb | 3 + app/models/sale_payment.rb | 13 +- .../credit_payments/create.json.jbuilder | 1 + .../origami/credit_payments/index.html.erb | 167 +++++++++++++++++- app/views/origami/payments/show.html.erb | 2 +- config/routes.rb | 3 +- 8 files changed, 200 insertions(+), 13 deletions(-) create mode 100644 app/views/origami/credit_payments/create.json.jbuilder diff --git a/Gemfile b/Gemfile index 8f16e924..227cfa72 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -#gem 'pg' +gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb index a348951e..ff9ae413 100644 --- a/app/controllers/origami/credit_payments_controller.rb +++ b/app/controllers/origami/credit_payments_controller.rb @@ -2,9 +2,31 @@ class Origami::CreditPaymentsController < 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 + @creditcount = 0 + others = 0 + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "visa" + @creditcount = @creditcount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @can_credit = total - @creditcount - 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, "creditnote") + end end end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 310dfbc5..e3705294 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -39,6 +39,7 @@ class Origami::PaymentsController < BaseOrigamiController @visacount= 0.0 @jcbcount= 0.0 @mastercount = 0.0 + @credit = 0.0 @sale_data = Sale.find_by_sale_id(sale_id) #get customer amount @@ -75,6 +76,8 @@ class Origami::PaymentsController < BaseOrigamiController @jcbcount += spay.payment_amount elsif spay.payment_method == "master" @mastercount += spay.payment_amount + elsif spay.payment_method == "creditnote" + @credit += spay.payment_amount end end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 65fc96b0..e4ad5364 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -9,7 +9,6 @@ class SalePayment < ApplicationRecord 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) - self.sale = invoice self.received_amount = cash_amount amount_due = invoice.grand_total @@ -28,7 +27,7 @@ class SalePayment < ApplicationRecord when "cash" payment_status = cash_payment when "creditnote" - if !self.customer_id.nil? + if !self.sale.customer_id.nil? payment_status = creditnote_payment(self.customer_id) end when "visa" @@ -142,7 +141,7 @@ class SalePayment < ApplicationRecord self.payment_method = "creditnote" self.payment_amount = self.received_amount self.customer_id = self.customer_id - self.outstanding_amount = 0 - self.received_amount + self.outstanding_amount = 0 - self.received_amount.to_f self.payment_status = "outstanding" payment_method = self.save! @@ -207,10 +206,7 @@ class SalePayment < ApplicationRecord 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) - puts 'mmmmmmmmmmmmmmmmmmmmmmmmmmm' - puts membership_data.to_json - puts "amountttttttttttttttttttttt" - puts self.received_amount + if membership_data["status"]==true self.payment_method = "paypar" self.payment_amount = self.received_amount @@ -271,8 +267,7 @@ class SalePayment < ApplicationRecord def rebat(sObj) rebate_prices = SaleItem.calculate_rebate_by_account(sObj.sale_items) - puts "eeeeeeeeeeeeeeeeeeeeeeee" - puts rebate_prices + generic_customer_id = sObj.customer.membership_id if generic_customer_id != nil || generic_customer_id != "" || generic_customer_id != 0 paypar = sObj.sale_payments diff --git a/app/views/origami/credit_payments/create.json.jbuilder b/app/views/origami/credit_payments/create.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/credit_payments/create.json.jbuilder @@ -0,0 +1 @@ +json.status true diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb index e4f97119..dc2b5b85 100644 --- a/app/views/origami/credit_payments/index.html.erb +++ b/app/views/origami/credit_payments/index.html.erb @@ -1 +1,166 @@ -hello Credit + +
      + +
      +
      +
      +

      CREDIT PAYMENT

      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      + <% if @creditcount != 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/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 08f833a2..cef27145 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -105,7 +105,7 @@
      Credit
      -
      0.0
      +
      <%= @credit %>
      <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%>
      diff --git a/config/routes.rb b/config/routes.rb index fea13a34..39b9aca5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -81,7 +81,7 @@ Rails.application.routes.draw do post 'item_void_cancel' => "sale_edit#item_void_cancel" post 'cancel_all_void' => 'sale_edit#cancel_all_void' post 'apply_void' => 'sale_edit#apply_void' - + get 'table/:dining_id/movetable' => "movetable#move_dining" get 'table/:dining_id/moveroom' => "moveroom#move_dining" get 'sale/:sale_id' => 'sales#show' @@ -105,6 +105,7 @@ Rails.application.routes.draw do post 'payment/master' => "master#create" post 'payment/visa' => "visa#create" post 'payment/paypar' => 'paypar_payments#create' + post 'payment/credit' => 'credit_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" From 02e3ebefda0a98b58600741c5da85ca7fc02473b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 17:56:31 +0630 Subject: [PATCH 101/128] update receipt --- .../origami/payments_controller.rb | 12 ++++--- .../origami/request_bills_controller.rb | 5 +-- app/models/printer/receipt_printer.rb | 4 +-- app/pdf/receipt_bill_pdf.rb | 34 +++++++++++-------- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 0119953f..e1108cfc 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -17,6 +17,8 @@ class Origami::PaymentsController < BaseOrigamiController unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) rebate_amount = Customer.get_membership_transactions(customer) + #shop detail + shop_details = Shop.find(1) # get member information member_info = Customer.get_member_account(customer) @@ -26,7 +28,7 @@ class Origami::PaymentsController < BaseOrigamiController item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount,shop_details) end end @@ -51,8 +53,8 @@ class Origami::PaymentsController < BaseOrigamiController @accountable_type = '' if response["status"]==true response["data"].each do |res| - if res["accountable_type"] == "RebateAccount" - @balance = res["balance"] + if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" + @balance += res["balance"] # @accountable_type = res["accountable_type"] @accountable_type = "Rebate Balance" end @@ -89,6 +91,8 @@ class Origami::PaymentsController < BaseOrigamiController unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) + #shop detail + shop_details = Shop.find(1) # get member information member_info = Customer.get_member_account(customer) rebate_amount = Customer.get_membership_transactions(customer) @@ -99,7 +103,7 @@ class Origami::PaymentsController < BaseOrigamiController item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, member_info,rebate_amount,shop_details) end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 95f63e58..bffec79d 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -20,8 +20,9 @@ class Origami::RequestBillsController < BaseOrigamiController end unique_code = "ReceiptBillPdf" + #shop detail + shop_details = Shop.find(1) # customer= Customer.where('customer_id=' +.customer_id) - customer= Customer.find(@sale_data.customer_id) # get member information member_info = Customer.get_member_account(customer) @@ -36,7 +37,7 @@ class Origami::RequestBillsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info) + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) # redirect_to origami_path(@sale_data.sale_id) end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 4b7287db..8e389e79 100644 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -65,11 +65,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Bill Receipt Print - def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount=nil) + def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details) #Use CUPS service #Generate PDF #Print - pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info,rebate_amount) + pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info,rebate_amount,shop_details) pdf.render_file "tmp/receipt_bill.pdf" self.print("tmp/receipt_bill.pdf") diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 4689de9d..b156e2c2 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,6 +1,6 @@ class ReceiptBillPdf < 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, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil) + def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details) self.page_width = 210 self.page_height = 2500 self.margin = 5 @@ -24,7 +24,7 @@ class ReceiptBillPdf < Prawn::Document self.header_font_size = 10 self.item_font_size = 8 - header( "Beauty In the Pot", printer_settings.name) + header( shop_details) stroke_horizontal_rule @@ -44,12 +44,15 @@ class ReceiptBillPdf < Prawn::Document footer end - def header (printer_name, name) - text "#{printer_name}", :left_margin => -10, :size => self.header_font_size,:align => :center + def header (shop_details) + move_down 7 + text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center move_down 5 - text "#{name}", :size => self.header_font_size,:align => :center + text "#{shop_details.address}", :size => self.item_font_size,:align => :center # move_down self.item_height move_down 5 + text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center + move_down 5 stroke_horizontal_rule end @@ -264,22 +267,23 @@ class ReceiptBillPdf < Prawn::Document end end if member_info["status"] == true + balance = 0.0 member_info["data"].each do |res| - if res["accountable_type"]== "RebateAccount" - - move_down 5 - y_position = cursor - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "Current Balance", :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 + if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" + balance = balance + res["balance"] end end + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Current Balance", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ balance }" , :size => self.item_font_size,:align => :right + end end end From feb1d662577f4bd7831a417447b07356a5ee7e8f Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Mon, 26 Jun 2017 18:00:48 +0630 Subject: [PATCH 102/128] overall void --- Gemfile.lock | 2 -- app/controllers/origami/home_controller.rb | 2 +- app/views/origami/home/show.html.erb | 20 +++++++++++++++++++- config/routes.rb | 3 +++ dump.rdb | Bin 18163 -> 18262 bytes 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e4b905ea..5c0f8a10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,6 @@ GEM nokogiri (1.8.0) mini_portile2 (~> 2.2.0) pdf-core (0.7.0) - pg (0.21.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -261,7 +260,6 @@ DEPENDENCIES kaminari (~> 1.0.1) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 3f70ad01..1b0aa491 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -35,7 +35,7 @@ class Origami::HomeController < BaseOrigamiController @status_order = 'order' else sale = Sale.find(booking.sale_id) - if sale.sale_status != "completed" + if sale.sale_status != "completed" && sale.sale_status != 'void' puts "enter" @sale_array.push(sale) if @status_order == 'order' diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 73f298ec..6342aee4 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -288,7 +288,7 @@ - + <% end %> @@ -454,5 +454,23 @@ $('#edit').on('click',function(){ var sale_id = "<%= @obj_sale.sale_id rescue "" %>" window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit"; }) + + $('#void').on('click',function () { + var sure = confirm("Are you sure want to Void"); + if (sure == true) { + var sale_id = $('#sale_id').val(); + var ajax_url = "/origami/sale/" + sale_id + '/void'; + $.ajax({ + type: 'POST', + url: ajax_url, + success: function () { + window.location.href = '/origami/'; + } + }) + } else { + + } + + }) diff --git a/config/routes.rb b/config/routes.rb index bf5d6483..db4acb5b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -110,6 +110,9 @@ Rails.application.routes.draw do get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index" get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index" + #---------Void --------------# + post 'sale/:sale_id/void' => 'void#overall_void' + #---------Add Customer --------------# #resources :customers get '/:sale_id/customers', to: "customers#add_customer" diff --git a/dump.rdb b/dump.rdb index 211fd505548a6a60b85596d4201ab6d1155b4f22..041df177e5969bb1b252b44f32d8d3f28339ced3 100644 GIT binary patch delta 3514 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 QmhL?oSn*?M^tKJO6EWEn2z3cCB1* zUvrc86L%B*z4nKEJH;jEv(K8wFYI?6C%W!*ezac@VftAiZ+Ko&g(ZtdM@El~Rno7f zU+esS^69aO;%NR@A=#gVuamvWiDG`dSU7wjUrhFsPHvQ>lxdwJ98<1)lgCF6C;g&=nWYAX~1xfb}I2WS?6Ql2!80M-e z6j!g85^t`W0rr46q(1TBSvySMTwbpbLK44TPI#@}+>P1p|{nExIFhVUW)}JE8v|yFYyV>D7;4cl$w}s4O zL@_1-k#p((#;({@ro7+&ps!=V7b#a<&wdm@Ghai#uk=b>Xk`HJGYQYlJe4w;@?t>7 zKL+yJ*L=Mdy&bRG3Zv++sMEf^VaT3bwY9sJ3YUN>SV=`T1M`y926M-|)DGfeR25T-o3E{lxxz z$Lq^zOf@hEObOY)?A-G(x|DINdFFsqf{~ioAP)hcy%<%VIr#Q=VasA`yryCli)d)s zRo^yIA)$oo@OwjV01VOg1}Q?Gf=feAE~SS4Z)A7*0^Wz`mobWg5;X-3Qb!}*12lbl zN|(Pr{Z?de;Sk#D_V-W48+VTthrydOJq_M6T5`{>4&9p>qUtbJjn4;(P$_8LyQ?5U zOd1f(2Z2eoe`&e%F-gJ3Jk<<37h{S^!O6=`)lzRdqG~93ssdA1;J2#QrDA}EA2Qxz zsCoL#BX1_6K6a?Hkut8eB7(-`re+zW@dQCj=R76OHTsK4r27~8N=5aUN>i`#(%p<-1 zbvC`dR_)X!zjw|-y!Cn+14jY^!?LbA(saj<><62dkBwqDr~KWr6LyP+83x4s;?e?f z!#ue>v&O%Az(T!U2r&kxbSpdLGc(n`uxx8lg?fCa*lZ_z+8PWxWq;bUWhh?LC^{bj z{m$O4YV>Ld#vJ-h6c%ELg)dRK-IxcvXRKZuzx?uI0`3b+(NY`?1quS80ztHMu>t5} z(8b(+maijG3Vj@UHuFy(ZQ!u*)&Km%r9{XHf`zQNu=gQ!xoRW0bP1L?XrYRRXCe{< z8bCcL@J{wgC~(F;v3fDl8012oQ8<0zFqq%;ox#$tVqkuT^4Yrq6Ry_u(dUm*5tx{+ z*`Q*S8xRPG^9 zmK{#sO_;V@T6TRCj-*G+$0EDOzLpzs9!al5n*!^YDV>jLpr+xo^+g-jK8J2Lf+d2P zRvG9`8Ve|$Xo|I6+Ws>;xTYMgENWnD!;Nr!Tm5K+g#?CYY91K)D#QdK#5;~-Se7q3 i@Ka%Zl*m%&Tx;YHaWB3a!*PA@&dJ~1`Nz4g7yl25cAGN* From 9d76e1313a0805aaebf8649332258f8a0dfc0a1f Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Mon, 26 Jun 2017 18:13:43 +0630 Subject: [PATCH 103/128] overall void update --- .idea/.generators | 8 + .idea/.rakeTasks | 7 + .idea/misc.xml | 4 + .idea/modules.xml | 8 + .idea/sxrestaurant.iml | 236 ++++++ .idea/vcs.xml | 6 + .idea/workspace.xml | 817 +++++++++++++++++++++ app/controllers/origami/void_controller.rb | 28 + config/routes.rb | 2 +- dump.rdb | Bin 18262 -> 18261 bytes 10 files changed, 1115 insertions(+), 1 deletion(-) create mode 100644 .idea/.generators create mode 100644 .idea/.rakeTasks create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/sxrestaurant.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 app/controllers/origami/void_controller.rb diff --git a/.idea/.generators b/.idea/.generators new file mode 100644 index 00000000..16189766 --- /dev/null +++ b/.idea/.generators @@ -0,0 +1,8 @@ + + diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks new file mode 100644 index 00000000..3577d8ad --- /dev/null +++ b/.idea/.rakeTasks @@ -0,0 +1,7 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..157739d4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..21ecc838 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml new file mode 100644 index 00000000..586fd380 --- /dev/null +++ b/.idea/sxrestaurant.iml @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..4d3242d5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,817 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + origami + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1498458293643 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb new file mode 100644 index 00000000..bea37a21 --- /dev/null +++ b/app/controllers/origami/void_controller.rb @@ -0,0 +1,28 @@ +class Origami::VoidController < BaseOrigamiController + + def overall_void + + sale_id = params[:sale_id] + if Sale.exists?(sale_id) + sale = Sale.find_by_sale_id(sale_id) + sale.payment_status = 'void' + sale.sale_status = 'void' + sale.save + + table_avaliable = true + table = sale.bookings[0].dining_facility + table.bookings.each do |booking| + if booking.sale.sale_status == 'new' + table_avaliable = false + end + end + + if table_avaliable == true + table.status = 'available' + table.save + end + + end + end + +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 3bb93268..73b361ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -128,7 +128,7 @@ Rails.application.routes.draw do #resources :customers get '/:sale_id/customers', to: "customers#add_customer" get '/:customer_id/get_customer' => 'home#get_customer',:as => "show_customer_details" - post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer"#update customer id in sale table + post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer" # update customer id in sale table end #--------- Waiter/Ordering Station ------------# diff --git a/dump.rdb b/dump.rdb index 041df177e5969bb1b252b44f32d8d3f28339ced3..acef6aa79d6c19cf0bb0d215a80225ad58500e81 100644 GIT binary patch delta 79 zcmV-V0I>hojsew<0gx~l!SYa9`UrJ%Wn?XFWo^Qs@f-mD0Q(gIlOPHgkzXDI&n7jI lfG`pfF*G?iG&eUgG&e3aIXE>qII+WvMhKKTSDj!bdc?;x9Bu#r delta 80 zcmV-W0I&bmjsez=0gx~lXYf#2`UrJ%Wn?XFWo^O`u^RyX0Q(gIlOGBfkzXDItLZC| mfG`shF*G?iG&eRjG%_wRGBYqYH#xDwi$(|>It&-MQ&#t<=^H`- From 1000968a8f8fc2464916404e72748bd1593aa4e7 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 18:14:36 +0630 Subject: [PATCH 104/128] update --- app/controllers/transactions/credit_notes_controller.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/controllers/transactions/credit_notes_controller.rb diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb new file mode 100644 index 00000000..e69de29b From cb77c771b88230f011146484f5a9363cbd1942ce Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 18:45:20 +0630 Subject: [PATCH 105/128] oqs update --- app/controllers/oqs/home_controller.rb | 2 +- app/models/order_queue_station.rb | 5 +++-- app/models/printer/order_queue_printer.rb | 8 ++++---- app/pdf/order_item_pdf.rb | 4 ++-- app/pdf/order_summary_pdf.rb | 18 +++++++++++++----- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 9887df6c..692b9c4a 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -118,6 +118,6 @@ class Oqs::HomeController < BaseOqsController left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") .where("assigned_order_items.delivery_status = #{status}") - .group("odt.order_items_id") + .group("assigned_order_items.assigned_order_item_id") end end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 4166f7af..bac229a9 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -45,7 +45,8 @@ class OrderQueueStation < ApplicationRecord end # Auto Printing # ToDo per item per printer - if oqs.auto_print && is_auto_printed == false + if oqs.auto_print && is_auto_printed == false + puts oqs_order_items.length print_slip(oqs, order, oqs_order_items) is_auto_printed = true end @@ -59,7 +60,7 @@ class OrderQueueStation < ApplicationRecord print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_summary(oqs,order.order_id, print_status="") + order_queue_printer.print_order_summary(oqs,order.order_id, order_items, print_status="") AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai| # update print status for order items diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 8535bcc2..bbeafecf 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -22,14 +22,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # Query for per order - def print_order_summary(oqs, order_id, print_status) + def print_order_summary(oqs, order_id, order_items, print_status) #Use CUPS service #Generate PDF - #Print + #Print order=print_query('order_summary', order_id) # For Print Per Item if oqs.cut_per_item - order.each do|odi| + order_items.each do|odi| filename = "tmp/order_item_#{odi.item_name}" + ".pdf" # For Item Options options = odi.options == "[]"? "" : odi.options @@ -46,7 +46,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Print Order Summary else filename = "tmp/order_summary_#{ order_id }" + ".pdf" - pdf = OrderSummaryPdf.new(order, print_status) + pdf = OrderSummaryPdf.new(order, print_status, order_items) pdf.render_file filename if oqs.print_copy self.print(filename, oqs.printer_name) diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 5a60b093..6d6346f9 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -18,8 +18,8 @@ class OrderItemPdf < Prawn::Document # 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 = 14 - self.item_font_size = 12 + self.header_font_size = 12 + self.item_font_size = 10 text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 stroke_horizontal_rule diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 2e9c41ec..d85a5916 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -1,6 +1,6 @@ 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, print_status) + def initialize(order, print_status, order_items = nil) self.page_width = 210 self.page_height = 1450 self.margin = 5 @@ -28,8 +28,11 @@ class OrderSummaryPdf < Prawn::Document order_info(order[0].order_id, order[0].order_by,order[0].order_at) # order items - order_items(order) - + if order_items == nil + order_items(order) + else + order_items(order_items) + end end # Write Order Information to PDF @@ -73,6 +76,7 @@ class OrderSummaryPdf < Prawn::Document #Add Order Item add_order_items(order_item) + end # Add order items under order info @@ -89,11 +93,11 @@ class OrderSummaryPdf < Prawn::Document # text_box "#{odi.qty}", :at =>[self.item_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix # } bounding_box([0,y_position], :width => self.item_width) do - text "#{odi.item_name}", :size => self.item_font_size,:align => :left, :height => self.item_height + text "#{odi.item_name}", :size => self.item_font_size,:align => :left end bounding_box([self.item_width,y_position], :width => self.qty_width) do - text "#{odi.qty}", :size => self.item_font_size,:align => :left, :height => self.item_height + text "#{odi.qty}", :size => self.item_font_size,:align => :left end move_down 5 @@ -109,6 +113,10 @@ class OrderSummaryPdf < Prawn::Document move_down 5 end + + dash(1, :space => 1, :phase => 1) + stroke_horizontal_line 0, (self.page_width - self.margin) + move_down 5 end end From 79befa4876e773dbf6862e5094b16e654424988d Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 26 Jun 2017 18:49:41 +0630 Subject: [PATCH 106/128] rake task fix --- lib/tasks/menu_import.rake | 313 +++++++++++++++++++------------------ 1 file changed, 161 insertions(+), 152 deletions(-) diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index b533dbb2..8ec56ea6 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -10,215 +10,224 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base" # 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}]) + 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:"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_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}]) + 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:"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_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}]) + 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken 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:"Cooling Coconut 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:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0093", 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:"II0103", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) + # Quart pot + menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"01004", name: "Quart Pot", alt_name: "Quart Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food }) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Quart Pot",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:10.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0054", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0064", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item3, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0094", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0104", menu_item: menu_category1_menu_item3, 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"}) +menu_category2 = MenuCategory.create({menu: menu, code:"C002", name: "Specialty 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Pork Platter",item_instance_code:"II0111", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beef Platter",item_instance_code:"II0121", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Assorted Seafood Platter",item_instance_code:"II0131", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0142", 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:"II0141", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0152", 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:"II0151", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0162", menu_item: menu_category1_menu_item8, 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_item8, 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0172", menu_item: menu_category1_menu_item9, price:6000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0171", menu_item: menu_category1_menu_item9, 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0182", menu_item: menu_category1_menu_item10, price:3500.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0181", menu_item: menu_category1_menu_item10, 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0192", 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:"II0191", menu_item: menu_category1_menu_item11, price:14000.00, is_on_promotion:false}]) + # Sliced Lamb + menu_category1_menu_item11 = SimpleMenuItem.create({item_code:"01012", name: "Sliced Lamb", 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:"II0202", 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:"II0201", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0212", 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:"II0211", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0222", 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:"II0221", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0232", 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:"II0231", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0242", 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:"II0241", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0252", 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:"II0251", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0262", 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:"II0261", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0272", 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:"II0271", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0282", 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:"II0281", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0292", 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:"II0291", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0302", 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:"II0301", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0312", 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:"II0311", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0322", 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:"II0321", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0332", 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:"II0331", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0342", 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:"II0341", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0352", 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:"II0351", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0362", 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:"II0361", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0372", 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:"II0371", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0382", 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:"II0381", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0392", 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:"II0391", 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}]) + menu_category1_menu_item32 = SimpleMenuItem.create({item_code:"01033", name: "Mushroom 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:"II0402", 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:"II0401", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0412", 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:"II0411", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0422", 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:"II0421", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0431", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0441", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0451", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0461", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0471", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0481", 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"}) +menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", alt_name: "Seafood", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0492", menu_item: menu_category1_menu_item41, price:30.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0491", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Small",item_instance_code:"II0501", 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:"II0502", 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:"II0503", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0512", 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:"II0511", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0522", 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:"II0521", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0532", 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:"II0531", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0542", 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:"II0541", menu_item: menu_category1_menu_item46, price:22000.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}]) @@ -232,7 +241,7 @@ menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", 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_category1_menu_item51 = SimpleMenuItem.create({item_code:"01052", name: "Fresh 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 @@ -249,15 +258,15 @@ menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0622", menu_item: menu_category1_menu_item55, price:3000.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:6000.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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0632", menu_item: menu_category1_menu_item56, price:4700.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:9400.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:"Half Potion",item_instance_code:"II0642", 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 }) @@ -265,16 +274,16 @@ menu_category8 = MenuCategory.create({menu: menu, code:"C008", name: "Seafood", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0661", menu_item: menu_category1_menu_item59, price:10.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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0671", menu_item: menu_category1_menu_item60, price:10.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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II0681", menu_item: menu_category1_menu_item61, price:10.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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:" ",item_instance_code:"II0691", menu_item: menu_category1_menu_item62, price:10.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 @@ -295,12 +304,12 @@ menu_category9 = MenuCategory.create({menu: menu, code:"C009", name: "Dumpling", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) @@ -337,7 +346,7 @@ menu_category12 = MenuCategory.create({menu: menu, code:"C0012", name: "Mushroom 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:"Half Potion",item_instance_code:"II0842", 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 }) @@ -353,7 +362,7 @@ menu_category12 = MenuCategory.create({menu: menu, code:"C0012", name: "Mushroom 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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 @@ -381,7 +390,7 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl 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_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 @@ -389,7 +398,7 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl 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_category1_menu_item90 = SimpleMenuItem.create({item_code:"01091", name: "Golden Taro", 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 @@ -452,32 +461,32 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl 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}]) +# Bamboo Shoot + 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:"II1132", 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:"II1131", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1142", 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:"II1141", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1152", 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:"II1151", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1162", 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:"II1161", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1172", 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:"II1171", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1182", 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:"II1181", menu_item: menu_category1_menu_item110, price:14000.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}]) @@ -498,59 +507,59 @@ menu_category15 = MenuCategory.create({menu: menu, code:"C0014", name: "Noodles" 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + 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:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",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 From 376af85c64b4360f1941981b481a3121bf7e422b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 19:02:36 +0630 Subject: [PATCH 107/128] update credit --- .../transactions/credit_notes_controller.rb | 18 +++++ app/models/sale.rb | 2 +- app/views/layouts/_header.html.erb | 1 + .../transactions/credit_notes/index.html.erb | 70 +++++++++++++++++++ config/routes.rb | 1 + 5 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 app/views/transactions/credit_notes/index.html.erb diff --git a/app/controllers/transactions/credit_notes_controller.rb b/app/controllers/transactions/credit_notes_controller.rb index e69de29b..0f370c96 100644 --- a/app/controllers/transactions/credit_notes_controller.rb +++ b/app/controllers/transactions/credit_notes_controller.rb @@ -0,0 +1,18 @@ +class Transactions::CreditNotesController < ApplicationController + before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy] + + # GET /transactions/sales + # GET /transactions/sales.json + def index + + @sales = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING) + + + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @sales } + end + + end + end \ No newline at end of file diff --git a/app/models/sale.rb b/app/models/sale.rb index 6b5efbb3..8f7f17d8 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -22,7 +22,7 @@ class Sale < ApplicationRecord "monthly" => 1, "yearly" => 2 } - + SALE_STATUS_OUTSTANDING = "outstanding" SALE_STATUS_COMPLETED = "completed" def generate_invoice_from_booking(booking_id, requested_by) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 5505bad7..05b74b7a 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -33,6 +33,7 @@
      • <%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %>
      • <%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %>
        • +
    • diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb new file mode 100644 index 00000000..fba0b52f --- /dev/null +++ b/app/views/transactions/credit_notes/index.html.erb @@ -0,0 +1,70 @@ +
      +
      +
        +
      1. Home
        2. +
      2. + Credit Note +
        3. + +
      +
      +
      + +
      +
      +
      +
      + + + + + + + + + + + + + + <% @sales.each do |sale| %> + + + + + + + + + <% end %> + + +
      Sale Id Receipt no Credit AmountCashierCustomer NameReceipt Date
      <%= link_to sale.sale_id, transactions_sale_path(sale) %><%= sale.receipt_no %><%credit = SalePayment.where('sale_id = ? AND payment_method=?', sale.sale_id,"creditnote").first %> + <%= credit.payment_amount rescue '-' %> + <%= sale.cashier_name rescue '-' %><%= link_to sale.customer.name, crm_customer_path(sale.customer_id) %> <%= sale.receipt_date.strftime("%d-%m-%Y") %>
      +
      + +
      +
      + +
      +
      + + + + + + diff --git a/config/routes.rb b/config/routes.rb index 39b9aca5..1f5ae75a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -225,6 +225,7 @@ Rails.application.routes.draw do namespace :transactions do resources :sales resources :orders + resources :credit_notes 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" From 60fe3b9a6744a6f8e27925af18262c06943c394c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 19:22:16 +0630 Subject: [PATCH 108/128] update crmad ability --- app/models/ability.rb | 23 +++++++++++++++++++--- app/views/crm/customers/index.html.erb | 2 +- app/views/origami/customers/index.html.erb | 2 +- config/application.rb | 1 + 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index f3e8da5c..5e5fb4f3 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -20,9 +20,9 @@ class Ability can :manage, Zone can :manage, CashierTerminal can :manage, Employee - can :manage, MembershipSetting - can :manage, MembershipAction - can :manage, PaymentMethodSetting + # can :manage, MembershipSetting + # can :manage, MembershipAction + # can :manage, PaymentMethodSetting can :manage, TaxProfile can :manage, PrintSetting can :manage, Account @@ -30,9 +30,26 @@ class Ability can :manage, Order can :manage, Sale + can :manage, Customer + can :index, :dailysale can :index, :saleitem + can :add_customer, Customer + can :update_sale_by_customer, Customer + + can :index, :discount + can :create, :discount + + can :show, :payment + can :create, :payment + can :reprint, :payment + + can :move_dining, :movetable + can :moving, :movetable + + can :move_dining, :moveroom + elsif user.role == "cashier" can :read, Order diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index a5ce8550..b3c1fce7 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -47,7 +47,7 @@ <% @i = 0 %> <% @crm_customers.each do |crm_customer| %> - <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <% if crm_customer.customer_id != "CUS-00001" && crm_customer.customer_id != "CUS-000000000" %> diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index d1886423..489487ab 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -41,7 +41,7 @@ <% if @crm_customers.count > 0 %> <% @i = 0 %> <% @crm_customers.each do |crm_customer| %> - <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> + <% if crm_customer.customer_id != "CUS-00000" && crm_customer.customer_id != "CUS-00000000" %> diff --git a/config/application.rb b/config/application.rb index 2a47de48..0e323d22 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,6 +13,7 @@ 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.time_zone = 'Asia/Rangoon' end end From 99ac82c888bbfa869b9ae01b8ab80f3096e697fe Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 19:28:02 +0630 Subject: [PATCH 109/128] update seed for shop and oqs --- app/models/order_queue_station.rb | 7 ++++--- db/seeds.rb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index bac229a9..bd2e85ca 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -46,9 +46,10 @@ class OrderQueueStation < ApplicationRecord # Auto Printing # ToDo per item per printer if oqs.auto_print && is_auto_printed == false - puts oqs_order_items.length - print_slip(oqs, order, oqs_order_items) - is_auto_printed = true + if oqs_order_items.length > 0 + print_slip(oqs, order, oqs_order_items) + is_auto_printed = true + end end end end diff --git a/db/seeds.rb b/db/seeds.rb index a00fd48f..64192b19 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -131,7 +131,7 @@ menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size" menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"}) menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) -shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.3, 23 street', township:"Yankin",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"09 99988888, 0912374734",reservation_no:"111",license:"123", +shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.42-A, Sayar San Road', township:"Bahan",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"+95(9) 252221188, +95(9) 252221177",reservation_no:"111",license:"123", activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111"}) #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"}) From 9a5656c5e669867998f65b0e2d2639ce5b430f0e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 20:13:56 +0630 Subject: [PATCH 110/128] update crm customer --- app/views/crm/customers/show.html.erb | 5 ++--- config/application.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 5c4bf7c8..3cf08856 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -55,9 +55,8 @@
      - <% puts "'''''''''''''''''''" - puts @response - if @response["status"] == true %> + <% + if @response["data"].present? %> <% if @response["status"] == true %> diff --git a/config/application.rb b/config/application.rb index 0e323d22..5ce0a92a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,7 +13,7 @@ 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.time_zone = 'Asia/Rangoon' + # config.time_zone = 'Asia/Rangoon' end end From 25967b82d35912cb55d2a3b1a39976cf787a8099 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 26 Jun 2017 20:44:15 +0630 Subject: [PATCH 111/128] update home link --- app/views/reports/daily_sale/index.html.erb | 2 +- app/views/reports/daily_sales/index.html.erb | 2 +- app/views/reports/receipt_no/index.html.erb | 2 +- app/views/reports/sale_item/index.html.erb | 2 +- app/views/reports/sale_items/index.html.erb | 6 +++--- db/seeds.rb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/reports/daily_sale/index.html.erb b/app/views/reports/daily_sale/index.html.erb index 7c2a8c61..7b790148 100644 --- a/app/views/reports/daily_sale/index.html.erb +++ b/app/views/reports/daily_sale/index.html.erb @@ -1,6 +1,6 @@
      diff --git a/app/views/reports/daily_sales/index.html.erb b/app/views/reports/daily_sales/index.html.erb index 7c2a8c61..7b790148 100644 --- a/app/views/reports/daily_sales/index.html.erb +++ b/app/views/reports/daily_sales/index.html.erb @@ -1,6 +1,6 @@
      diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 86307066..dc7d05ee 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,6 +1,6 @@
      diff --git a/app/views/reports/sale_item/index.html.erb b/app/views/reports/sale_item/index.html.erb index a3b460fc..7b0d6f38 100644 --- a/app/views/reports/sale_item/index.html.erb +++ b/app/views/reports/sale_item/index.html.erb @@ -1,6 +1,6 @@
      diff --git a/app/views/reports/sale_items/index.html.erb b/app/views/reports/sale_items/index.html.erb index a3b460fc..26ad560e 100644 --- a/app/views/reports/sale_items/index.html.erb +++ b/app/views/reports/sale_items/index.html.erb @@ -1,6 +1,6 @@
      @@ -11,13 +11,13 @@
      -
      +
      diff --git a/db/seeds.rb b/db/seeds.rb index 64192b19..841495d4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -131,7 +131,7 @@ menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size" menu_item_attribute_size_medium = MenuItemAttribute.create({attribute_type:"size",name: "Medium", value: "medium"}) menu_item_attribute_size_large = MenuItemAttribute.create({attribute_type:"size", name: "Large", value: "large"}) -shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.42-A, Sayar San Road', township:"Bahan",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"+95(9) 252221188, +95(9) 252221177",reservation_no:"111",license:"123", +shop = Shop.create({id:1, name: "Beauty In the Pot", address:'No.42-A, Sayar San Road, Bahan, Yangon', township:"Bahan",state:"Yangon",city:"Yangon", country:"Myanmar", phone_no:"+95(9) 252221188, +95(9) 252221177",reservation_no:"111",license:"123", activated_at:"2017-06-26 08:36:24",license_data:"test",base_currency:"111",id_prefix:"111"}) #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"}) From a236c94910571843dc33c72477bd6f8e798ca1a6 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 26 Jun 2017 20:58:12 +0630 Subject: [PATCH 112/128] mobile bill updated --- app/controllers/api/bill_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 09d75f70..f7a4070d 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -29,7 +29,12 @@ class Api::BillController < Api::ApiController @sale_items = SaleItem.where("sale_id=?",@sale_id) unique_code = "ReceiptBillPdf" + #shop detail + shop_details = Shop.find(1) + customer= Customer.where('customer_id=' + @sale_data.customer_id) + # get member information + member_info = Customer.get_member_account(customer) # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -38,7 +43,7 @@ class Api::BillController < Api::ApiController item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts) + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) end From b60715403777062679da62dadc1a6a5af3de7f2e Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Mon, 26 Jun 2017 21:56:13 +0630 Subject: [PATCH 113/128] New Login form --- Gemfile.lock | 2 - app/assets/images/profile-1.png | Bin 0 -> 23136 bytes app/assets/images/profile-2.png | Bin 0 -> 18806 bytes app/assets/images/profile-3.png | Bin 0 -> 25843 bytes app/controllers/application_controller.rb | 4 +- app/controllers/home_controller.rb | 26 ++++++++- app/helpers/application_helper.rb | 9 +++ app/models/employee.rb | 4 +- app/views/home/index.html.erb | 40 ++++++++++++- app/views/home/show.html.erb | 68 ++++++++++++++++++++++ app/views/layouts/application.html.erb | 11 ++-- config/routes.rb | 9 ++- 12 files changed, 154 insertions(+), 19 deletions(-) create mode 100644 app/assets/images/profile-1.png create mode 100644 app/assets/images/profile-2.png create mode 100644 app/assets/images/profile-3.png create mode 100644 app/views/home/show.html.erb diff --git a/Gemfile.lock b/Gemfile.lock index e4b905ea..5c0f8a10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,6 @@ GEM nokogiri (1.8.0) mini_portile2 (~> 2.2.0) pdf-core (0.7.0) - pg (0.21.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -261,7 +260,6 @@ DEPENDENCIES kaminari (~> 1.0.1) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) diff --git a/app/assets/images/profile-1.png b/app/assets/images/profile-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bc020542f3000959af6ab2dfdafc7a52ef681134 GIT binary patch literal 23136 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/profile-2.png b/app/assets/images/profile-2.png new file mode 100644 index 0000000000000000000000000000000000000000..b56112e225d22ba151beb3b6b9b1d50a9dcb9e9e GIT binary patch literal 18806 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/profile-3.png b/app/assets/images/profile-3.png new file mode 100644 index 0000000000000000000000000000000000000000..f2f65cc6d02337a48a53e92d95485f0550e3d5bb GIT binary patch literal 25843 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 "Invalid PIN for Employee. Please try again!" + end + end + def create @login_form = LoginForm.new() @login_form.emp_id = params[:login_form][:emp_id] @@ -21,9 +41,9 @@ class HomeController < ApplicationController else render :index end - else + else redirect_to origami_root_path, :notice => "Username and Password dosn't match!" - end + end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be794..96956958 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,11 @@ module ApplicationHelper + + def flash_class(level) + case level + when :notice then "alert alert-info fade-in" + when :success then "alert alert-success fade-in" + when :error then "alert alert-error fade-in" + when :alert then "alert alert-error fade-in" + end +end end diff --git a/app/models/employee.rb b/app/models/employee.rb index 98b8380b..69eb3fae 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -13,9 +13,9 @@ class Employee < ApplicationRecord def self.login(emp_id, password) user = Employee.find_by_emp_id(emp_id) if (user) - user.authenticate(password) + #user.authenticate(password) - if (user) + if (user.authenticate(password)) user.generate_token user.session_expiry = DateTime.now.utc + 30.minutes user.session_last_login = DateTime.now.utc diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 35eb6481..87bf3f50 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,7 +1,7 @@ - + +
      +
      +
      + + <% @employees.each do |employee| %> + +
      +
      +
      +

      + <%= employee.name %> +

      +
      + (<%= employee.emp_id%>) +
      +
      + <%= employee.role %> +
      +
      +
      + <% end %> +
      +
      + + diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb new file mode 100644 index 00000000..84b6f199 --- /dev/null +++ b/app/views/home/show.html.erb @@ -0,0 +1,68 @@ + + +
      +
      + <%= simple_form_for(@login_form, url: emp_login_update_path, method: "PATCH") do |f| %> +
      +
      +
      + <%= f.input :emp_id,as: :hidden, label: "Access PIN", required: false, class: "form-control" %> + + <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %> +
      +
      +
      + + + + + + + + + + + + + +
      +
      + +
      + +
      + + <% end %> +
      +
      + + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1d4991e6..a4c62ce3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,12 +17,11 @@ <%= render 'layouts/header' %>
      - <% flash.each do |type, message| %> -
      - - <%= message %> -
      - <% end %> + <% flash.each do |key, value| %> +
      + <%= value %> +
      + <% end %> <%= yield %>
      diff --git a/config/routes.rb b/config/routes.rb index c93beb92..efb9ca5d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - namespace :settings do - resources :membership_actions - end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -16,6 +13,9 @@ Rails.application.routes.draw do post 'install' => 'install#create' #--------- Login/Authentication ------------# + get 'emp_login/:emp_id' => 'home#show' , as: :emp_login + patch "emp_login/:emp_id" => 'home#update', as: :emp_login_update + post 'login' => 'home#create' delete 'logout' => 'home#destroy' get 'dashboard' => 'home#dashboard' @@ -196,6 +196,8 @@ Rails.application.routes.draw do resources :payment_method_settings #membership_settings resources :membership_settings + resources :membership_actions + #zones resources :zones do #tables @@ -205,6 +207,7 @@ Rails.application.routes.draw do end end + #--------- Transactions Sections ------------# namespace :transactions do resources :sales From c1646b812e199a7967207ae93b38ec53dc10f073 Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Tue, 27 Jun 2017 01:15:40 +0630 Subject: [PATCH 114/128] route update --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index d009de8f..b6535034 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,8 +13,8 @@ Rails.application.routes.draw do post 'install' => 'install#create' #--------- Login/Authentication ------------# - get 'emp_login/:emp_id' => 'home#show' , as: :emp_login - patch "emp_login/:emp_id" => 'home#update', as: :emp_login_update + get 'auth/:emp_id' => 'home#show' , as: :emp_login + patch "auth/:emp_id" => 'home#update', as: :emp_login_update post 'login' => 'home#create' delete 'logout' => 'home#destroy' From e09dbb095c6582c8947951d30e57c117f7bf2ba1 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 27 Jun 2017 10:15:22 +0630 Subject: [PATCH 115/128] not to show price 0 and 10 --- app/models/order_queue_station.rb | 4 +- app/models/printer/order_queue_printer.rb | 71 +++++++++++++---------- app/pdf/order_item_pdf.rb | 2 +- app/pdf/order_summary_pdf.rb | 52 ++++++++--------- app/views/origami/home/show.html.erb | 4 +- app/views/origami/rooms/show.html.erb | 4 +- 6 files changed, 74 insertions(+), 63 deletions(-) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index bd2e85ca..7a220e0f 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -38,7 +38,9 @@ class OrderQueueStation < ApplicationRecord # else AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - oqs_order_items.push(order_item) + if (order_item.price != 10 || order_item.price != 0) + oqs_order_items.push(order_item) + end # end end end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index bbeafecf..363d9b38 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -6,19 +6,23 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #Print order_item = print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code) - filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" - pdf = OrderItemPdf.new(order_item[0], print_status, options) - pdf.render_file filename + filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" - if oqs.print_copy - self.print(filename, oqs.printer_name) + # check for item not to show + if order_item[0].price == 0 || order_item[0].price == 10 + pdf = OrderItemPdf.new(order_item[0], print_status, options) + pdf.render_file filename - #For print copy - pdf.render_file filename.gsub(".","-copy.") - self.print(filename.gsub(".","-copy."), oqs.printer_name) - else - self.print(filename, oqs.printer_name) - end + if oqs.print_copy + self.print(filename, oqs.printer_name) + + #For print copy + pdf.render_file filename.gsub(".","-copy.") + self.print(filename.gsub(".","-copy."), oqs.printer_name) + else + self.print(filename, oqs.printer_name) + end + end end # Query for per order @@ -33,14 +37,18 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker filename = "tmp/order_item_#{odi.item_name}" + ".pdf" # For Item Options options = odi.options == "[]"? "" : odi.options - pdf = OrderItemPdf.new(odi, print_status, options) - # pdf.render_file "tmp/order_item.pdf" - pdf.render_file filename - if oqs.print_copy - self.print(filename, oqs.printer_name) - self.print(filename.gsub(".","-copy."), oqs.printer_name) - else - self.print(filename, oqs.printer_name) + + # check for item not to show + if odi.price == 0 || odi.price == 10 + pdf = OrderItemPdf.new(odi, print_status, options) + # pdf.render_file "tmp/order_item.pdf" + pdf.render_file filename + if oqs.print_copy + self.print(filename, oqs.printer_name) + self.print(filename.gsub(".","-copy."), oqs.printer_name) + else + self.print(filename, oqs.printer_name) + end end end # For Print Order Summary @@ -69,19 +77,22 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker filename = "tmp/order_item_#{odi.item_name}" + ".pdf" # For Item Options options = odi.options == "[]"? "" : odi.options - pdf = OrderItemPdf.new(odi, print_status, options) - - pdf.render_file filename - if oqs.print_copy - self.print(filename, oqs.printer_name) + # check for item not to show + if odi.price == 0 || odi.price == 10 + pdf = OrderItemPdf.new(odi, print_status, options) + pdf.render_file filename - #For print copy - pdf.render_file filename.gsub(".","-copy.") - self.print(filename.gsub(".","-copy."), oqs.printer_name) - else - self.print(filename, oqs.printer_name) - end + if oqs.print_copy + self.print(filename, oqs.printer_name) + + #For print copy + pdf.render_file filename.gsub(".","-copy.") + self.print(filename.gsub(".","-copy."), oqs.printer_name) + else + self.print(filename, oqs.printer_name) + end + end end # For Print Order Summary else diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 6d6346f9..b6c821fc 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -60,7 +60,7 @@ class OrderItemPdf < Prawn::Document def order_items(order_item, options) y_position = cursor - #Add Order Item + #Add Order Item add_order_items(order_item, options) dash(1, :space => 1, :phase => 1) diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index d85a5916..504bbc51 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -86,38 +86,36 @@ class OrderSummaryPdf < Prawn::Document move_down 5 order_item.each do|odi| - y_position = cursor - - # pad_top(15) { - # text_box "#{odi.item_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix - # text_box "#{odi.qty}", :at =>[self.item_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - # } - bounding_box([0,y_position], :width => self.item_width) do - text "#{odi.item_name}", :size => self.item_font_size,:align => :left - end - - bounding_box([self.item_width,y_position], :width => self.qty_width) do - text "#{odi.qty}", :size => self.item_font_size,:align => :left - end - - move_down 5 - - # add option - options = odi.options == "[]"? "" : odi.options - - if options != "" + # check for item not to show + if odi.price == 0 || odi.price == 10 y_position = cursor - bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "#{options}", :size => self.item_font_size,:align => :left + + bounding_box([0,y_position], :width => self.item_width) do + text "#{odi.item_name}", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width) do + text "#{odi.qty}", :size => self.item_font_size,:align => :left end move_down 5 + + # add option + options = odi.options == "[]"? "" : odi.options + + if options != "" + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{options}", :size => self.item_font_size,:align => :left + end + + move_down 5 + end + + dash(1, :space => 1, :phase => 1) + stroke_horizontal_line 0, (self.page_width - self.margin) + move_down 5 end - - dash(1, :space => 1, :phase => 1) - stroke_horizontal_line 0, (self.page_width - self.margin) - move_down 5 end - end end diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2e852b7c..efbb3e10 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -163,7 +163,7 @@ <% # Can't check for discount - unless sale_item.price == 0 + unless sale_item.price == 0 || sale_item.price == 10 %>
      @@ -183,7 +183,7 @@ count += 1 sub_total = sub_total + (order_item.price * order_item.qty) - unless order_item.price == 0 %> + unless order_item.price == 0 || order_item.price == 10 %> diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 584410d6..0ddaff7a 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -158,7 +158,7 @@ sub_total = sub_total + sale_item.price %> - <% unless sale_item.price == 0 %> + <% unless sale_item.price == 0 || sale_item.price == 10 %> @@ -174,7 +174,7 @@ @order_items.each do |order_item | sub_total = sub_total + (order_item.price * order_item.qty) - unless order_item.price == 0 %> + unless order_item.price == 0 || order_item.price == 10 %> From 535a5825fb8d9fb9f974847ec0a2aac1aa466d53 Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 27 Jun 2017 10:28:47 +0630 Subject: [PATCH 116/128] get update --- app/controllers/origami/orders_controller.rb | 6 ++++-- app/views/origami/orders/show.html.erb | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index cc5fac3f..ef213ddd 100644 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -8,8 +8,10 @@ class Origami::OrdersController < BaseOrigamiController @order = Order.find(params[:order_id]) sale_order = SaleOrder.find_by_order_id(@order.order_id) if sale_order - sale = Sale.find(sale_order.sale_id) - @sale_status = sale.sale_status + unless sale_order.sale_id.nil? + sale = Sale.find(sale_order.sale_id) + @sale_status = sale.sale_status + end end end end diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index d2c065a1..5ecb56d1 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -95,10 +95,12 @@ order_status = "" sale_order = SaleOrder.find_by_order_id(order) if sale_order - sale = Sale.find(sale_order.sale_id) - order_status = sale.sale_status - if order_status == 'new' - order_status = order.status + unless sale_order.sale_id.nil? + sale = Sale.find(sale_order.sale_id) + order_status = sale.sale_status + if order_status == 'new' + order_status = order.status + end end else order_status = order.status From 37da55610f584c21921ad886c0c52803c66fec2a Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 27 Jun 2017 11:32:10 +0630 Subject: [PATCH 117/128] Shop View --- app/views/home/dashboard.html.erb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index f77959cd..c695ff14 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,7 +1,7 @@
      - <%= current_login_employee.name %> +
      Welcome <%= current_login_employee.name %> !

      <% if current_login_employee.role = "admin" %> <% elsif current_login_employee.role = "cashier" %> <%= link_to "Cashier Station", origami_path %> @@ -13,7 +13,23 @@ <%= link_to "Cashier Station", oishi_path %> <% end %> + <% shop = Shop.first %> + + + +
      +
      +

      <%= shop.name %>

      +
      +
      + <%= shop.address %> +
      +
      + <%= shop.phone_no %> +
      + +
      From 2f8c6e25a142c304eec9509a85b21bb965072877 Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 27 Jun 2017 11:33:03 +0630 Subject: [PATCH 118/128] Shop View --- app/views/home/dashboard.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index c695ff14..6b49c880 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,7 +1,7 @@
      -
      Welcome <%= current_login_employee.name %> !

      + <% if current_login_employee.role = "admin" %> <% elsif current_login_employee.role = "cashier" %> <%= link_to "Cashier Station", origami_path %> From b5518c2ddb782cb162c7c3424f3f401970c529ef Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 27 Jun 2017 11:35:10 +0630 Subject: [PATCH 119/128] rake task fix --- lib/tasks/menu_import.rake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index 8ec56ea6..fffe37b3 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -30,7 +30,7 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base" 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:"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}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken 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:"Herbal Drunken Chicken Broth",item_instance_code:"II0073", menu_item: menu_category1_menu_item2, price:8000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut 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:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0093", 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:"II0103", menu_item: menu_category1_menu_item2, price:6000.00, is_on_promotion:false}]) @@ -39,8 +39,8 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base" menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Quart Pot",item_instance_code:"II0041", menu_item: menu_category1_menu_item3, price:10.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Beauty Collagen Broth",item_instance_code:"II0054", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Spicy Nourishing Broth ",item_instance_code:"II0064", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) - menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item3, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Herbal Drunken Chicken Broth",item_instance_code:"II0074", menu_item: menu_category1_menu_item3, price:8000.00, is_on_promotion:false}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Cooling Coconut Broth",item_instance_code:"II0084", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Lonevity Wild Pine Mushroom Broth",item_instance_code:"II0094", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Vitamin C Tomato Sweet Corn Broth",item_instance_code:"II0104", menu_item: menu_category1_menu_item3, price:6000.00, is_on_promotion:false}]) @@ -48,7 +48,7 @@ menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Soup Base" # Assorted Platter menu_category2 = MenuCategory.create({menu: menu, code:"C002", name: "Specialty 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_category1_menu_item3 = SimpleMenuItem.create({item_code:"01048", 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:"II0111", 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 }) From bcd44db9a2cdd97f44ee9adbc5d81505ce061037 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Tue, 27 Jun 2017 11:35:36 +0630 Subject: [PATCH 120/128] multiple invoice void --- .idea/workspace.xml | 615 ++++++++++++++---- .../origami/table_invoices_controller.rb | 2 +- app/controllers/origami/void_controller.rb | 8 + app/views/origami/home/index.html.erb | 1 + app/views/origami/home/show.html.erb | 33 +- app/views/origami/orders/show.html.erb | 2 +- app/views/origami/payments/show.html.erb | 22 +- app/views/origami/rooms/show.html.erb | 2 +- app/views/origami/sales/show.html.erb | 6 +- .../origami/table_invoices/show.html.erb | 19 +- dump.rdb | Bin 18261 -> 17895 bytes 11 files changed, 568 insertions(+), 142 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4d3242d5..b5dfb1c3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,16 +2,17 @@ - - - - - - - - - + + + + + + + + + + @@ -27,21 +28,73 @@ - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50,33 +103,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -85,8 +113,18 @@ - - + + + + + + + + + + + + @@ -97,6 +135,8 @@ origami + table_invoice + sale_id @@ -105,11 +145,17 @@ @@ -168,6 +214,264 @@ - @@ -672,38 +998,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -712,22 +1006,6 @@ - - - - - - - - - - - - - - - - @@ -760,16 +1038,27 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -781,34 +1070,124 @@ - + - - + + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb index 32e0ef7f..4571ba87 100644 --- a/app/controllers/origami/table_invoices_controller.rb +++ b/app/controllers/origami/table_invoices_controller.rb @@ -25,7 +25,7 @@ class Origami::TableInvoicesController < BaseOrigamiController else sale = Sale.find(booking.sale_id) - if sale.sale_status != "completed" + if sale.sale_status != "completed" && sale.sale_status != 'void' @sale_array.push(sale) end end diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index bea37a21..3515b010 100644 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -9,6 +9,14 @@ class Origami::VoidController < BaseOrigamiController sale.sale_status = 'void' sale.save + bookings = sale.bookings + bookings.each do |booking| + orders = booking.orders + orders.each do |order| + # order.status = 'void' + end + end + table_avaliable = true table = sale.bookings[0].dining_facility table.bookings.each do |booking| diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 5888bb3e..cd451e68 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -27,6 +27,7 @@
      <%= sale.receipt_no %> + <%= sale.sale_status %>
      <% end %> diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2e852b7c..84f606f8 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -27,6 +27,7 @@
      <%= sale.receipt_no %> + <%= sale.sale_status %>
      <% end %> @@ -287,7 +288,7 @@ - + <% else %> @@ -474,23 +475,23 @@ $('#edit').on('click',function(){ window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit"; }) - $('#void').on('click',function () { - var sure = confirm("Are you sure want to Void"); - if (sure == true) { - var sale_id = $('#sale_id').val(); - var ajax_url = "/origami/sale/" + sale_id + '/void'; - $.ajax({ - type: 'POST', - url: ajax_url, - success: function () { - window.location.href = '/origami/'; - } - }) - } else { +$('#void').on('click',function () { + var sure = confirm("Are you sure want to Void"); + if (sure == true) { + var sale_id = $('#sale_id').val(); + var ajax_url = "/origami/sale/" + sale_id + '/void'; + $.ajax({ + type: 'POST', + url: ajax_url, + success: function () { + window.location.href = '/origami/'; + } + }) + } else { - } + } - }) +}) diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index d2c065a1..b386a86d 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -26,7 +26,7 @@ <% @complete.each do |sale| %>
      - <%= sale.receipt_no %> + <%= sale.receipt_no %><%= sale.sale_status %>
      <% end %> diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index cef27145..4d9089b5 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -11,7 +11,7 @@
      - + @@ -244,7 +244,7 @@ - + @@ -354,6 +354,23 @@ $( document ).ready(function() { } }); +$('#void').on('click',function () { + var sure = confirm("Are you sure want to Void"); + if (sure == true) { + var sale_id = $('#sale_id').text(); + var ajax_url = "/origami/sale/" + sale_id + '/void'; + $.ajax({ + type: 'POST', + url: ajax_url, + success: function () { + window.location.href = '/origami/'; + } + }) + } else { + + } +}); + }); function update_balance(){ @@ -369,4 +386,5 @@ function update_balance(){ var result = amount_due - total; $('#balance').text(result.toFixed(2)); } + diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 584410d6..77b35a40 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -26,7 +26,7 @@ <% @complete.each do |sale| %>
      - <%= sale.receipt_no %> + <%= sale.receipt_no %><%= sale.sale_status %>
      <% end %> diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index cd716052..8e660261 100644 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -26,7 +26,7 @@ <% @complete.each do |sale| %>
      - <%= sale.receipt_no %> + <%= sale.receipt_no %><%= sale.sale_status %>
      <% end %> @@ -185,7 +185,9 @@
      - + <% if @sale.sale_status != 'void' %> + + <% end %>
      diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb index ee66f9a3..ade1f021 100644 --- a/app/views/origami/table_invoices/show.html.erb +++ b/app/views/origami/table_invoices/show.html.erb @@ -128,6 +128,7 @@
      +
      diff --git a/dump.rdb b/dump.rdb index acef6aa79d6c19cf0bb0d215a80225ad58500e81..989b20db9eb66d7ef6d034695caac9e1fa5f72fb 100644 GIT binary patch delta 1616 zcmZvcU1(cn7{~MGq_hibnoer$T+*|#>RfDmzdz`<_C)9K16=j0)2+o?)X65T?!t>g zTs9pj;&|~sv;{9j=yrM`ZphjwBZ}Y$f>Y-@Ce#bDt4;)k>HD6OoaCan59d73|M@-t z|NGrLVD&BVF1#zbIx_lC$B9=apBp$fd2IP$HWRxY`!@r0UovxcESH!VU0Xf-I_+dc z35g0)A*}eh<;U#@cP6m7l=f5ct`0Dzb4ePi3gwiaTx7 zldn#{maBT#iX(anmGzCipPQ}_F;*a4U?KI6)ZxLE*jz$!NmS)#Vr=5&6UT?EF;+^) zUR(hWl>81}z?cX^X0{-zB$H5zu*9JBze?T$&XwW;)Ba&y8XETZb-w_dYsDvndAs@L zbV@cRGR~Ni`eOFT5SWisDcth-dVS)j&54U-i@@7m&=&B!Z>f{+Q6~@)`ZXKWAc)R%hf5%guxTj>=2h=|JvDgRcY2Qk z=XzcFjcs2&Qr+=906+N)WCS!iQV1zy zM&{^H>|6ptq-5nb7@KhO!(Y3zUROwdX_LXsA(9+7(Hqsari8LrwUkfkTU#%uH${|% z+YfL+c@WGy+>EMh1R3yx`;mhviWb0>7K}3xGp&En3*@w3*jel9j2bJ*&Gpvh(|Zz( zQ;I78S;_Ygf73V}EG=8k9213_ifvbpsrk9;t<-(^XlJd(7f2C=knzRgeV69jj4>5% z)hrrTTx_?-K$L`%xe*V;3MEx9yxd9s-mY4zDOz%(^!C(|y~gAYp;EbX;~Tl$vSx}1 zr6T1*g*C;HcD*zH8@pcu{`G;Yj`MSI#9u;>f%N7E9Bd>rH>dyVIpm#O0kaN8lvdX2 z=3aJvFBTs4ycvWD$CAqWAjKp%&M`G514LnTdS%mq5<@}5sDe31Q9(9LYOn)WoJM{@ zkk}o#v5V4c`8V~Cxt5DkNI4E{s5iUayIP!QGtUtsEP`P*+7ji`FDb*|m*P{#d}Td* zPpvz`O`&3hyM6kT?4kYT(tJBDK=Xt_?#_?@QHSwa(=Ikem{UcY(3O-yi8I+aX<2W{ zG+9tiA+szzbI~?II5SRc8oX{6SXzu5(C&per{NA95sB<8Vgf}B=SI-KbZedMjWfFa zaj4zYvwI|jQqdO5kqLc!Koeg9)lAyHCDw-6c-+FQdfyiJ+vNMDp;=&jaxh?&?Wr}Q zPXs1Z=|6j>?u{N3-(+$78Apj`Y7{eMs8R|l-}SDx#ea>PcYUkwJwQAD#&6Gj{LqKL F{SO!nWb;8p~1wU(TGj8O?)hj37{)U(Er}KbEiq!ez|kb`Oo>z zH-CI+egBa)1GkhO9e(}ahUv*%wtqA?x>$U;E%YSxxWm$)TAOEwc0|7EWxvi|pv_bW zOht?-$)ucHJYYFH!z~TrV`2A0eYk0xzT6bIy7cT|r~bJKH1^tc6S=90GhNP;XaBLB z@#hX%En!JH*j!Iyl5@$hzA*4c;`a4A!iB=L_#iSgGCn<)D1)0xE0kZg1`19CjUkGd zz~|Z!HPl!T$-I$7sGM9&9o4117keNdmXc!GpXDQ@pTgm6e@0T$udw8~+;M6{lEJ#Q z2kKXz$DNx9mf4XUR#}|QiQya^7QhZOhV;XZ_FhRilQ1S2Qiy?5p|SL>)lgT|NJpF- z>5NMbl}@y!WrQjuW$}?O{7djz(sqTz!Yx-gqCzrXIKq^BBMBjP9z_4P?E9(xu6QTi ze#){}Qiq(<-UC*1Ktmandh5QocauV^??$~rfP|3>CRLCi=uIfY<>XJPAs0{Q<=p^< z3r>-Kl>z;@Tg5|jwlJ?tTuJ|D4UK@l#J3?{0f&V}7n~7_&u#LZX3(Fga`H!=-1V-L z+OQGp-am25^-8qLd|AMfZQTxzMW z#s})dnDeS5FNNkJ5_5=(Ph3NGC+-Cz!2&3`G9|)_oNIMGaSd1Ah?w15_I$XcNA|4u zfh$3Us`(JVa(lkcWG+?B2vAP?iMmE0#5nh#VD_7f%1A=xT-*A{vX@gC&u_bXX`SB` zBLvs+>~sB&Fit7D7OI5%UG*)nQ1*BP!!^SR!-iTgBFo7YpJJ3RMI)Y50EA81z%Jdo z1?cn99usMMsxWVM#N>t`2lJVYEZ%FN!i3afRqlc+%(&ShKaW3OSZc1YB)TlZL1Q%y zW%iSp=)hchLmUM!46Y=uZNI5k44RSI@VR}Lo!@#*kM8>=IMT7y(p(K)5>r3r)5MuA zg`^u3uTTh#6%X`dZYTsMCX9nSf3bt*clz$EgEt+6q6+__O%YuO&#Lt;HM+ZlrMW)A zQQ){Tqs%Pqir=ix?Oz84#wJi%H7H>WLJ%o1`!s_*c&ZdZK_AQwF_a9N-?;v}#l56Y zZu+XGT_`C`xhfYT9=ECS=4sZr;DR%TRp1TbZe_XI-YWJ*eIr)8J!U~`$ih}skN~;p z7oZezx1ECl%fCBr#|*BSQE6`45BkW?_noWwsBJH%UiReAJhODZdK%0zlpJ(5O-zhW z42|X{Co?A!7o*c-`LX;|K65&MHkSn>;Cf^#Gd2a*T0RGbLb7xsbg+ASXfSaUblS%= z`O~Y`nbpw85yd4@#ozr~zECaCz^Zj4A|a)LsSGu$n1m9VzX9i7{4Yxn^}grqNgS)Q U7WB;Ep@yq_Ui&27bM}k>0awo~Z~y=R From e38886790c56a4e5713c5677117564c5ad5c1ab8 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 27 Jun 2017 11:52:51 +0630 Subject: [PATCH 121/128] not show price 0 fixed --- app/controllers/oqs/home_controller.rb | 2 +- app/models/order.rb | 9 +++++++ app/models/order_queue_station.rb | 6 ++--- app/models/printer/order_queue_printer.rb | 12 ++++----- app/pdf/order_summary_pdf.rb | 6 +++-- app/pdf/receipt_bill_pdf.rb | 29 ++++++++++++---------- app/views/oqs/home/index.html.erb | 14 +++++++---- app/views/origami/discounts/index.html.erb | 12 ++++++--- app/views/origami/home/show.html.erb | 4 +-- app/views/origami/rooms/show.html.erb | 4 +-- 10 files changed, 61 insertions(+), 37 deletions(-) diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 692b9c4a..0d4d07dc 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -117,7 +117,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status}") + .where("assigned_order_items.delivery_status = #{status} AND odt.price <> 0") .group("assigned_order_items.assigned_order_item_id") end end diff --git a/app/models/order.rb b/app/models/order.rb index 018013e4..b3a70f37 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -82,6 +82,15 @@ class Order < ApplicationRecord set_order_items end + # not insert with price 0 + # puts item[:price] + # puts item + # if(item[:price] != 0 ) + # OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id], + # item[:quantity],menu_item[:price], item[:options], set_order_items, self.id, + # self.employee_name) + # end + OrderItem.processs_item(menu_item[:item_code], menu_item[:name], menu_item[:account_id], item[:quantity],menu_item[:price], item[:options], set_order_items, self.id, self.employee_name) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 7a220e0f..7e3352d1 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -36,9 +36,9 @@ class OrderQueueStation < ApplicationRecord # #Same Order_items can appear in two location. # AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) # else - - AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) - if (order_item.price != 10 || order_item.price != 0) + + if (order_item.price != 0) + AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) oqs_order_items.push(order_item) end # end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 363d9b38..f80ee72d 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -9,7 +9,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker filename = "tmp/order_item_#{order_item[0].item_name}" + ".pdf" # check for item not to show - if order_item[0].price == 0 || order_item[0].price == 10 + if order_item[0].price != 0 pdf = OrderItemPdf.new(order_item[0], print_status, options) pdf.render_file filename @@ -39,7 +39,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker options = odi.options == "[]"? "" : odi.options # check for item not to show - if odi.price == 0 || odi.price == 10 + if odi.price != 0 || odi.price != 10 pdf = OrderItemPdf.new(odi, print_status, options) # pdf.render_file "tmp/order_item.pdf" pdf.render_file filename @@ -79,7 +79,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker options = odi.options == "[]"? "" : odi.options # check for item not to show - if odi.price == 0 || odi.price == 10 + if odi.price != 0 pdf = OrderItemPdf.new(odi, print_status, options) pdf.render_file filename @@ -120,7 +120,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker 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("order_items.item_code = '#{ id }'") + .where("order_items.item_code = '#{ id }' AND order_items.price != 0") .group("order_items.item_code") elsif type == "order_summary" OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining") @@ -129,7 +129,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker 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 = '#{ id }'") + .where("orders.order_id = '#{ id }' AND order_items.price != 0") .group("order_items.order_items_id") else # order summary for booking @@ -139,7 +139,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker 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("b.booking_id = '#{ id }'") + .where("b.booking_id = '#{ id }' AND order_items.price != 0") end end diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 504bbc51..89eac43c 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -87,7 +87,7 @@ class OrderSummaryPdf < Prawn::Document order_item.each do|odi| # check for item not to show - if odi.price == 0 || odi.price == 10 + if odi.price != 0 y_position = cursor bounding_box([0,y_position], :width => self.item_width) do @@ -105,13 +105,15 @@ class OrderSummaryPdf < Prawn::Document if options != "" y_position = cursor - bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + bounding_box([0,y_position], :width => self.item_width) do text "#{options}", :size => self.item_font_size,:align => :left end move_down 5 end + move_down 5 + dash(1, :space => 1, :phase => 1) stroke_horizontal_line 0, (self.page_width - self.margin) move_down 5 diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index b156e2c2..27c08b80 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -119,22 +119,25 @@ class ReceiptBillPdf < Prawn::Document 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 + # check for item not to show + if item.price != 0 + 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 + y_position = cursor - pad_top(15) { - text_box "#{product_name}", :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 =>[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}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - } - move_down 1 + pad_top(15) { + text_box "#{product_name}", :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 =>[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}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + move_down 1 + end end stroke_horizontal_rule diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index ed704dcb..0f387dad 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -34,7 +34,8 @@
      <% - @queue_completed_item.each do |qid| + @queue_completed_item.each do |qid| + if qid.price != 0 %>
      @@ -69,7 +70,8 @@
      - <% + <% + end end %>
      @@ -85,8 +87,9 @@
      <% - @queue_items_details.each do |qid| - if qid.station_name == qsi[:station_name] + @queue_items_details.each do |qid| + if qid.price != 0 + if qid.station_name == qsi[:station_name] %>
      @@ -121,7 +124,8 @@
      - <% + <% + end end end %> diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index e3cca128..9979c32f 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -29,7 +29,10 @@
      <% sub_total = 0 %> <% @sale_data.sale_items.each do |sale_item| %> - <% sub_total += sale_item.qty*sale_item.unit_price%> + <% + sub_total += sale_item.qty*sale_item.unit_price + unless sale_item.price == 0 + %> > - <%end %> + <% + end + end + %>
      Membership Transactions
      <%= count %>
      <%= count %> <%= order_item.item_name %>
      <%= sale_item.product_name %> <%= sale_item.qty %>
      <%= order_item.item_name %> <%= order_item.qty %>
      Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %>Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %>Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %>
      Customer : <%= @sale_data.customer.name%>
      @@ -42,7 +45,10 @@ <%=(sale_item.qty*sale_item.unit_price)%>
      @@ -166,7 +172,7 @@
      - +
      diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index efbb3e10..2e852b7c 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -163,7 +163,7 @@ <% # Can't check for discount - unless sale_item.price == 0 || sale_item.price == 10 + unless sale_item.price == 0 %> <%= count %> @@ -183,7 +183,7 @@ count += 1 sub_total = sub_total + (order_item.price * order_item.qty) - unless order_item.price == 0 || order_item.price == 10 %> + unless order_item.price == 0 %> <%= count %> <%= order_item.item_name %> diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 0ddaff7a..584410d6 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -158,7 +158,7 @@ sub_total = sub_total + sale_item.price %> - <% unless sale_item.price == 0 || sale_item.price == 10 %> + <% unless sale_item.price == 0 %> <%= sale_item.product_name %> <%= sale_item.qty %> @@ -174,7 +174,7 @@ @order_items.each do |order_item | sub_total = sub_total + (order_item.price * order_item.qty) - unless order_item.price == 0 || order_item.price == 10 %> + unless order_item.price == 0 %> <%= order_item.item_name %> <%= order_item.qty %> From 9f44ac0031beaababc81d3af2ab6c331bb0b0d45 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 27 Jun 2017 12:03:17 +0630 Subject: [PATCH 122/128] update page height bill pdf --- app/pdf/receipt_bill_pdf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 27c08b80..4ae0a67d 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -2,7 +2,7 @@ class ReceiptBillPdf < 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, sale_items, sale_data, customer_name, item_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details) self.page_width = 210 - self.page_height = 2500 + self.page_height = 7000 self.margin = 5 self.price_width = 40 self.qty_width = 20 From f8062cec643247f0f749218fa53bf0b47eba9220 Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 27 Jun 2017 12:05:45 +0630 Subject: [PATCH 123/128] Credit payment --- app/models/sale_payment.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index e4ad5364..8b28c946 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -97,7 +97,7 @@ class SalePayment < ApplicationRecord sale_data.sale_payments.each do |sale_payment| others = others + sale_payment.payment_amount end - redeem_prices = sale_data.grand_total -others + redeem_prices = sale_data.grand_total - others # Control for Paypar Cloud begin response = HTTParty.post(url, @@ -232,11 +232,19 @@ class SalePayment < ApplicationRecord 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) + is_credit = 0 sObj.sale_payments.each do |spay| all_received_amount += spay.payment_amount.to_f + if spay.payment_method == "creditnote" + is_credit = 1 + end end if (self.sale.grand_total <= all_received_amount) - self.sale.payment_status = "paid" + if is_credit == 0 + self.sale.payment_status = "paid" + else + self.sale.payment_status = "outstanding" + end self.sale.sale_status = "completed" self.sale.save! table_update_status(sObj) From 7810fc693b94a2a05a6e486e40b9eded5a231ca5 Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 27 Jun 2017 12:06:18 +0630 Subject: [PATCH 124/128] Pending Payment --- app/views/origami/home/show.html.erb | 6 ++- app/views/origami/rooms/show.html.erb | 68 +++++++++++++++++---------- 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2e852b7c..be13b58c 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -138,7 +138,7 @@ <%if @customer %>

      Customer : <%= @customer.name rescue "" %>

      - <%end%> + <%end%>
      • @@ -249,8 +249,10 @@ <% end %> + <% if @sale_array.size > 1 %>

      Pending Payment + <% end %> <% @sale_array.each do |sale| if @sale_array.size > 1 unless sale.receipt_no == @sale_array[0].receipt_no @@ -473,7 +475,7 @@ $('#edit').on('click',function(){ var sale_id = "<%= @obj_sale.sale_id rescue "" %>" window.location.href = '/origami/table/'+ dining_id + "/sale/"+ sale_id + "/edit"; }) - + $('#void').on('click',function () { var sure = confirm("Are you sure want to Void"); if (sure == true) { diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 584410d6..a3f52cec 100644 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -155,7 +155,7 @@ sub_total = 0 if @status == "sale" @obj.sale_items.each do |sale_item| - sub_total = sub_total + sale_item.price + sub_total = sub_total + sale_item.price %> <% unless sale_item.price == 0 %> @@ -213,32 +213,52 @@

      + <% + if @status_sale == 'sale' + unless @order_items.nil? + %> + Pending New Order + + <% + count = 0 + @order_items.each do |order_item | + count += 1 + %> - <% - if @status == 'sale' - unless @order_items.nil? - %> - Added New Order -
      - <% - @order_items.each do |order_item | + + + + + + + <% + end %> +
      <%= count %> + <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
      + + <% end %> + <% if @sale_array.size > 1 %> +

      + Pending Payment + <% end %> + <% @sale_array.each do |sale| + if @sale_array.size > 1 + unless sale.receipt_no == @sale_array[0].receipt_no + %> - - <%= order_item.item_name %> - <%= order_item.qty %> - <%= order_item.qty*order_item.price %> - - - <% - end - %> - - - <% - end - end - %> + + + + + +
      Receipt No - <%= sale.receipt_no %>
      + <% + end + end + end + end + %>
      From 697bacf200fa09012a6aff0bc6fff18942d276f6 Mon Sep 17 00:00:00 2001 From: Phyo Date: Tue, 27 Jun 2017 12:06:39 +0630 Subject: [PATCH 125/128] rake task --- lib/tasks/menu_import.rake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake index fffe37b3..1979d364 100644 --- a/lib/tasks/menu_import.rake +++ b/lib/tasks/menu_import.rake @@ -462,7 +462,7 @@ menu_category13 = MenuCategory.create({menu: menu, code:"C0012", name: "Vegetabl 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}]) # Bamboo Shoot - 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_category1_menu_item105 = SimpleMenuItem.create({item_code:"01112", name: "Bamboo Shoot", 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:"II1132", 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:"II1131", menu_item: menu_category1_menu_item105, price:2400.00, is_on_promotion:false}]) # Others @@ -566,17 +566,17 @@ menu_category19 = MenuCategory.create({menu: menu, code:"C0018", name: "Beer", a 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}]) +# # 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Can",item_instance_code:"II1402", 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:"II1401", 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}]) + menu_item0_instance = MenuItemInstance.create([{item_instance_name:"",item_instance_code:"II141", 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}]) From df722de0e78decb5eb1e12563a946caf616a8a99 Mon Sep 17 00:00:00 2001 From: Nweni Date: Tue, 27 Jun 2017 14:02:44 +0630 Subject: [PATCH 126/128] billed --- app/controllers/api/bill_controller.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index f7a4070d..4fdd0c35 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -19,7 +19,7 @@ class Api::BillController < Api::ApiController @sale_id = booking.sale_id end end - + elsif (params[:order_id]) @sale = Sale.new @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee) @@ -29,12 +29,7 @@ class Api::BillController < Api::ApiController @sale_items = SaleItem.where("sale_id=?",@sale_id) unique_code = "ReceiptBillPdf" - #shop detail - shop_details = Shop.find(1) - - customer= Customer.where('customer_id=' + @sale_data.customer_id) - # get member information - member_info = Customer.get_member_account(customer) + customer= Customer.find(@sale_data.customer_id) # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -43,7 +38,7 @@ class Api::BillController < Api::ApiController item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts) end From ee651763b7403f0285d1405627791172d7662373 Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Wed, 28 Jun 2017 10:34:42 +0630 Subject: [PATCH 127/128] shift close and payment journal --- app/assets/javascripts/cash_mgmt.coffee | 3 ++ app/assets/javascripts/origami/shifts.coffee | 3 ++ app/assets/stylesheets/cash_mgmt.scss | 3 ++ app/assets/stylesheets/origami/shifts.scss | 3 ++ app/controllers/home_controller.rb | 24 +++++++++++++- .../origami/cash_mgmt_controller.rb | 10 ++++++ app/controllers/origami/shifts_controller.rb | 13 ++++++++ app/forms/open_shift_form.rb | 16 +++++++++ app/helpers/cash_mgmt_helper.rb | 2 ++ app/helpers/origami/shifts_helper.rb | 2 ++ app/models/payment_journal.rb | 2 ++ app/models/shift_sale.rb | 25 ++++++++++++++ app/views/origami/cash_mgmt/create.html.erb | 2 ++ app/views/origami/cash_mgmt/index.html.erb | 2 ++ app/views/origami/cash_mgmt/new.html.erb | 2 ++ app/views/origami/shifts/edit.html.erb | 2 ++ app/views/origami/shifts/index.html.erb | 2 ++ app/views/origami/shifts/new.html.erb | 2 ++ app/views/origami/shifts/show.html.erb | 2 ++ config/routes.rb | 13 ++++++++ .../20170626191519_create_shift_sales.rb | 25 ++++++++++++++ .../20170627035218_create_payment_journals.rb | 15 +++++++++ db/scaffold_structure | 2 ++ spec/controllers/cash_mgmt_controller_spec.rb | 26 +++++++++++++++ .../origami/shifts_controller_spec.rb | 33 +++++++++++++++++++ spec/helpers/cash_mgmt_helper_spec.rb | 15 +++++++++ spec/helpers/origami/shifts_helper_spec.rb | 15 +++++++++ spec/models/payment_journal_spec.rb | 5 +++ spec/models/shift_sale_spec.rb | 5 +++ spec/views/cash_mgmt/create.html.erb_spec.rb | 5 +++ spec/views/cash_mgmt/index.html.erb_spec.rb | 5 +++ spec/views/cash_mgmt/new.html.erb_spec.rb | 5 +++ .../origami/shifts/edit.html.erb_spec.rb | 5 +++ .../origami/shifts/index.html.erb_spec.rb | 5 +++ .../views/origami/shifts/new.html.erb_spec.rb | 5 +++ .../origami/shifts/show.html.erb_spec.rb | 5 +++ 36 files changed, 308 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/cash_mgmt.coffee create mode 100644 app/assets/javascripts/origami/shifts.coffee create mode 100644 app/assets/stylesheets/cash_mgmt.scss create mode 100644 app/assets/stylesheets/origami/shifts.scss create mode 100644 app/controllers/origami/cash_mgmt_controller.rb create mode 100644 app/controllers/origami/shifts_controller.rb create mode 100644 app/forms/open_shift_form.rb create mode 100644 app/helpers/cash_mgmt_helper.rb create mode 100644 app/helpers/origami/shifts_helper.rb create mode 100644 app/models/payment_journal.rb create mode 100644 app/models/shift_sale.rb create mode 100644 app/views/origami/cash_mgmt/create.html.erb create mode 100644 app/views/origami/cash_mgmt/index.html.erb create mode 100644 app/views/origami/cash_mgmt/new.html.erb create mode 100644 app/views/origami/shifts/edit.html.erb create mode 100644 app/views/origami/shifts/index.html.erb create mode 100644 app/views/origami/shifts/new.html.erb create mode 100644 app/views/origami/shifts/show.html.erb create mode 100644 db/migrate/20170626191519_create_shift_sales.rb create mode 100644 db/migrate/20170627035218_create_payment_journals.rb create mode 100644 spec/controllers/cash_mgmt_controller_spec.rb create mode 100644 spec/controllers/origami/shifts_controller_spec.rb create mode 100644 spec/helpers/cash_mgmt_helper_spec.rb create mode 100644 spec/helpers/origami/shifts_helper_spec.rb create mode 100644 spec/models/payment_journal_spec.rb create mode 100644 spec/models/shift_sale_spec.rb create mode 100644 spec/views/cash_mgmt/create.html.erb_spec.rb create mode 100644 spec/views/cash_mgmt/index.html.erb_spec.rb create mode 100644 spec/views/cash_mgmt/new.html.erb_spec.rb create mode 100644 spec/views/origami/shifts/edit.html.erb_spec.rb create mode 100644 spec/views/origami/shifts/index.html.erb_spec.rb create mode 100644 spec/views/origami/shifts/new.html.erb_spec.rb create mode 100644 spec/views/origami/shifts/show.html.erb_spec.rb diff --git a/app/assets/javascripts/cash_mgmt.coffee b/app/assets/javascripts/cash_mgmt.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/cash_mgmt.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/shifts.coffee b/app/assets/javascripts/origami/shifts.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/shifts.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/cash_mgmt.scss b/app/assets/stylesheets/cash_mgmt.scss new file mode 100644 index 00000000..dfec4c04 --- /dev/null +++ b/app/assets/stylesheets/cash_mgmt.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the cash_mgmt 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/origami/shifts.scss b/app/assets/stylesheets/origami/shifts.scss new file mode 100644 index 00000000..ee1b2c4e --- /dev/null +++ b/app/assets/stylesheets/origami/shifts.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/shifts controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1f93e6aa..e7e960ee 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -19,7 +19,8 @@ class HomeController < ApplicationController if @employee != nil session[:session_token] = @employee.token_session - redirect_to origami_root_path + route_by_role(@employee) + else render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!" end @@ -74,4 +75,25 @@ class HomeController < ApplicationController def settings_home_params params.require(:login_form).permit(:emp_id, :password) end + + def route_by_role(employee) + if employee.role == "administrator" + redirect_to dashboard_path + elsif employee.role == "cashier" + #check if cashier has existing open cashier + + # if !ShiftSale.current_open_shift(employee).nil? + # redirect_to origami_root_path + # else + redirect_to new_origami_shift_path + # end + elsif employee.role == "checker" + redirect_to oqs_root_path + elsif employee.role == "waiter" + redirect_to oqs_root_path + elsif employee.role == "crm" + redirect_to crm_root_path + + end + end end diff --git a/app/controllers/origami/cash_mgmt_controller.rb b/app/controllers/origami/cash_mgmt_controller.rb new file mode 100644 index 00000000..aaf55c1f --- /dev/null +++ b/app/controllers/origami/cash_mgmt_controller.rb @@ -0,0 +1,10 @@ +class Origami::CashMgmtController < ApplicationController + def index + end + + def new + end + + def create + end +end diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb new file mode 100644 index 00000000..4cd17cce --- /dev/null +++ b/app/controllers/origami/shifts_controller.rb @@ -0,0 +1,13 @@ +class Origami::ShiftsController < ApplicationController + def index + end + + def show + end + + def new + end + + def edit + end +end diff --git a/app/forms/open_shift_form.rb b/app/forms/open_shift_form.rb new file mode 100644 index 00000000..019e6f3e --- /dev/null +++ b/app/forms/open_shift_form.rb @@ -0,0 +1,16 @@ +class LoginForm + include ActiveModel::Model + include ActiveModel::Validations + + attr_accessor :float_amount + validates_presence_of :float_amount + + def persisted? + false + end + + def initialize(attributes={}) + super + end + +end diff --git a/app/helpers/cash_mgmt_helper.rb b/app/helpers/cash_mgmt_helper.rb new file mode 100644 index 00000000..5c1ad77b --- /dev/null +++ b/app/helpers/cash_mgmt_helper.rb @@ -0,0 +1,2 @@ +module CashMgmtHelper +end diff --git a/app/helpers/origami/shifts_helper.rb b/app/helpers/origami/shifts_helper.rb new file mode 100644 index 00000000..ae63824e --- /dev/null +++ b/app/helpers/origami/shifts_helper.rb @@ -0,0 +1,2 @@ +module Origami::ShiftsHelper +end diff --git a/app/models/payment_journal.rb b/app/models/payment_journal.rb new file mode 100644 index 00000000..237f9cd4 --- /dev/null +++ b/app/models/payment_journal.rb @@ -0,0 +1,2 @@ +class PaymentJournal < ApplicationRecord +end diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb new file mode 100644 index 00000000..97d7ab0e --- /dev/null +++ b/app/models/shift_sale.rb @@ -0,0 +1,25 @@ + +#Description +#total_revenue = sum of all sub-total from sales table +#total_discounts = sum of all discount (overall) from sales tables +#total_taxes = sum of all taxes from sales table (Service + Goverment Tax (commercial_taxes)) +#grand_total = total_revenue - total_discounts + total_taxes +#nett_sales = grand_total - commercial_taxes +#cash_sales = cash payment total revenue +#credit_sales = credit payment total revenue +#others_sales = [Sum of each of other payment type --- mpu, jcb, visa,master, rebate, vochure] +#commercial_taxes = Total Goverment tax due +#cash_in = Payment receive +#Cash_out = Payment issues for misc payments + +class ShiftSale < ApplicationRecord + belongs_to :cashier_terminal + belongs_to :employee + + def self.current_open_shift(current_user) + #if current_user + #find open shift where is open today and is not closed and login by current cashier + @shift = ShiftSale.where("cast(shift_started_at as date) = #{DateTime.now.to_date} and shift_started_at is null and employee_id = #{current_user.id}").limit(1) + #end + end +end diff --git a/app/views/origami/cash_mgmt/create.html.erb b/app/views/origami/cash_mgmt/create.html.erb new file mode 100644 index 00000000..1b4805a2 --- /dev/null +++ b/app/views/origami/cash_mgmt/create.html.erb @@ -0,0 +1,2 @@ +

      CashMgmt#create

      +

      Find me in app/views/cash_mgmt/create.html.erb

      diff --git a/app/views/origami/cash_mgmt/index.html.erb b/app/views/origami/cash_mgmt/index.html.erb new file mode 100644 index 00000000..1f64a3df --- /dev/null +++ b/app/views/origami/cash_mgmt/index.html.erb @@ -0,0 +1,2 @@ +

      CashMgmt#index

      +

      Find me in app/views/cash_mgmt/index.html.erb

      diff --git a/app/views/origami/cash_mgmt/new.html.erb b/app/views/origami/cash_mgmt/new.html.erb new file mode 100644 index 00000000..9f22e0c3 --- /dev/null +++ b/app/views/origami/cash_mgmt/new.html.erb @@ -0,0 +1,2 @@ +

      CashMgmt#new

      +

      Find me in app/views/cash_mgmt/new.html.erb

      diff --git a/app/views/origami/shifts/edit.html.erb b/app/views/origami/shifts/edit.html.erb new file mode 100644 index 00000000..26d96cb5 --- /dev/null +++ b/app/views/origami/shifts/edit.html.erb @@ -0,0 +1,2 @@ +

      Origami::Shifts#edit

      +

      Find me in app/views/origami/shifts/edit.html.erb

      diff --git a/app/views/origami/shifts/index.html.erb b/app/views/origami/shifts/index.html.erb new file mode 100644 index 00000000..ebec0301 --- /dev/null +++ b/app/views/origami/shifts/index.html.erb @@ -0,0 +1,2 @@ +

      Origami::Shifts#index

      +

      Find me in app/views/origami/shifts/index.html.erb

      diff --git a/app/views/origami/shifts/new.html.erb b/app/views/origami/shifts/new.html.erb new file mode 100644 index 00000000..4a216f69 --- /dev/null +++ b/app/views/origami/shifts/new.html.erb @@ -0,0 +1,2 @@ +

      Origami::Shifts#new

      +

      Find me in app/views/origami/shifts/new.html.erb

      diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb new file mode 100644 index 00000000..189c3d62 --- /dev/null +++ b/app/views/origami/shifts/show.html.erb @@ -0,0 +1,2 @@ +

      Origami::Shifts#show

      +

      Find me in app/views/origami/shifts/show.html.erb

      diff --git a/config/routes.rb b/config/routes.rb index b6535034..36b23aea 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -96,6 +96,19 @@ Rails.application.routes.draw do post "/:id/request_bills" => "request_bills#print",:as => "request_bill" ,:defaults => { :format => 'json' } get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' } + + #---------Shift ---------------# + resources :shifts, only: [:index, :show, :new, :create, :edit, :update] + #shift - index (open/close shift landing page) + #shift - show (sales summary display) + #shift - new (open shift) + #shift - edit (close shift) + + resources :cash_mgmt, only: [:new, :create] + #payment - accepting or expending money from cashier - [Cash Journal] + #payment - Incoming payments - [accept all payment types (cash, other payments (except rebate)) + #payment - Outing payments - Cash only [ *Misc expeness tracking] + #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb new file mode 100644 index 00000000..762b4fc3 --- /dev/null +++ b/db/migrate/20170626191519_create_shift_sales.rb @@ -0,0 +1,25 @@ +class CreateShiftSales < ActiveRecord::Migration[5.1] + def change + create_table :shift_sales do |t| + t.references :cashier_terminal, foreign_key: true, :null => false + t.datetime :shift_started_at + t.datetime :shift_closed_at + t.references :employee, foreign_key: true #cashier + t.decimal :opening_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :closing_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :total_revenue, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :total_discounts, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :total_taxes, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :nett_sales, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :cash_sales, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :credit_sales, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.json :other_sales + t.decimal :commercial_taxes, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :cash_in, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :cash_out, :precision => 10, :scale => 2, :null => false, :default => 0.00 + + t.timestamps + end + end +end diff --git a/db/migrate/20170627035218_create_payment_journals.rb b/db/migrate/20170627035218_create_payment_journals.rb new file mode 100644 index 00000000..e7f4c903 --- /dev/null +++ b/db/migrate/20170627035218_create_payment_journals.rb @@ -0,0 +1,15 @@ +class CreatePaymentJournals < ActiveRecord::Migration[5.1] + def change + create_table :payment_journals do |t| + t.string :payment_references,:null => false + t.string :remark + t.decimal :credit_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :debit_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.string :payment_method,:null => false, :default => "CASH" + t.string :payment_status,:null => false, :default => "NEW" + t.string :payment_method_references + + t.timestamps + end + end +end diff --git a/db/scaffold_structure b/db/scaffold_structure index 064f62d4..cd8a52c0 100644 --- a/db/scaffold_structure +++ b/db/scaffold_structure @@ -22,3 +22,5 @@ rails generate scaffold_controller Setup/CashierTerminal name:string is_active:b rails generate scaffold_controller Settings/OrderQueueStation station_name:string is_active:boolean processing_items:json print_copy:boolean printer_name:string font_size:integer cut_per_item:boolean use_alternate_name:boolean created_by:string --no-migration rails generate scaffold_controller transactions/Sale cashier:references cashier_name:string requested_by:string requested_at:datetime receipt_no:string receipt_date:datetime customer:references payment_status:string sale_status:string total_amount:decimal total_discount:decimal total_tax:decimal tax_type:string grand_total:decimal rounding_adjustment:decimal amount_received:decimal amount_changed:decimal --no-migration + +rails g model shift_sale cashier_terminal:references shift_started_at:datetime shift_closed_at:datetime employee:references opening_balance:decimal closing_balance:decimal total_revenue:decimal total_discounts:decimal total_taxes:decimal grand_total:decimal nett_sales:decimal cash_sales:decimal credit_sales:decimal other_sales:decimal commercial_taxes:decimal cash_in:decimal cash_out:decimal diff --git a/spec/controllers/cash_mgmt_controller_spec.rb b/spec/controllers/cash_mgmt_controller_spec.rb new file mode 100644 index 00000000..0772e07e --- /dev/null +++ b/spec/controllers/cash_mgmt_controller_spec.rb @@ -0,0 +1,26 @@ +require 'rails_helper' + +RSpec.describe CashMgmtController, type: :controller do + + describe "GET #index" do + it "returns http success" do + get :index + expect(response).to have_http_status(:success) + end + end + + describe "GET #new" do + it "returns http success" do + get :new + expect(response).to have_http_status(:success) + end + end + + describe "GET #create" do + it "returns http success" do + get :create + expect(response).to have_http_status(:success) + end + end + +end diff --git a/spec/controllers/origami/shifts_controller_spec.rb b/spec/controllers/origami/shifts_controller_spec.rb new file mode 100644 index 00000000..6bc402b9 --- /dev/null +++ b/spec/controllers/origami/shifts_controller_spec.rb @@ -0,0 +1,33 @@ +require 'rails_helper' + +RSpec.describe Origami::ShiftsController, type: :controller do + + describe "GET #index" do + it "returns http success" do + get :index + expect(response).to have_http_status(:success) + end + end + + describe "GET #show" do + it "returns http success" do + get :show + expect(response).to have_http_status(:success) + end + end + + describe "GET #new" do + it "returns http success" do + get :new + expect(response).to have_http_status(:success) + end + end + + describe "GET #edit" do + it "returns http success" do + get :edit + expect(response).to have_http_status(:success) + end + end + +end diff --git a/spec/helpers/cash_mgmt_helper_spec.rb b/spec/helpers/cash_mgmt_helper_spec.rb new file mode 100644 index 00000000..c1b99e8f --- /dev/null +++ b/spec/helpers/cash_mgmt_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the CashMgmtHelper. For example: +# +# describe CashMgmtHelper 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 CashMgmtHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/helpers/origami/shifts_helper_spec.rb b/spec/helpers/origami/shifts_helper_spec.rb new file mode 100644 index 00000000..52cd53cc --- /dev/null +++ b/spec/helpers/origami/shifts_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::ShiftsHelper. For example: +# +# describe Origami::ShiftsHelper 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::ShiftsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/payment_journal_spec.rb b/spec/models/payment_journal_spec.rb new file mode 100644 index 00000000..1d69ec1b --- /dev/null +++ b/spec/models/payment_journal_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe PaymentJournal, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/shift_sale_spec.rb b/spec/models/shift_sale_spec.rb new file mode 100644 index 00000000..18b726dc --- /dev/null +++ b/spec/models/shift_sale_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ShiftSale, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/cash_mgmt/create.html.erb_spec.rb b/spec/views/cash_mgmt/create.html.erb_spec.rb new file mode 100644 index 00000000..99f19970 --- /dev/null +++ b/spec/views/cash_mgmt/create.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "cash_mgmt/create.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/cash_mgmt/index.html.erb_spec.rb b/spec/views/cash_mgmt/index.html.erb_spec.rb new file mode 100644 index 00000000..47aac0d1 --- /dev/null +++ b/spec/views/cash_mgmt/index.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "cash_mgmt/index.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/cash_mgmt/new.html.erb_spec.rb b/spec/views/cash_mgmt/new.html.erb_spec.rb new file mode 100644 index 00000000..75ceeb52 --- /dev/null +++ b/spec/views/cash_mgmt/new.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "cash_mgmt/new.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/origami/shifts/edit.html.erb_spec.rb b/spec/views/origami/shifts/edit.html.erb_spec.rb new file mode 100644 index 00000000..3e38121f --- /dev/null +++ b/spec/views/origami/shifts/edit.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "shifts/edit.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/origami/shifts/index.html.erb_spec.rb b/spec/views/origami/shifts/index.html.erb_spec.rb new file mode 100644 index 00000000..6a148d25 --- /dev/null +++ b/spec/views/origami/shifts/index.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "shifts/index.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/origami/shifts/new.html.erb_spec.rb b/spec/views/origami/shifts/new.html.erb_spec.rb new file mode 100644 index 00000000..60e9a23c --- /dev/null +++ b/spec/views/origami/shifts/new.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "shifts/new.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/origami/shifts/show.html.erb_spec.rb b/spec/views/origami/shifts/show.html.erb_spec.rb new file mode 100644 index 00000000..372203e3 --- /dev/null +++ b/spec/views/origami/shifts/show.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "shifts/show.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end From f01e1b1ce36288c0c01e3294d25cd800d295338f Mon Sep 17 00:00:00 2001 From: Nweni Date: Wed, 28 Jun 2017 12:57:39 +0630 Subject: [PATCH 128/128] edit login --- app/controllers/home_controller.rb | 4 +- app/models/employee.rb | 4 ++ app/views/home/show.html.erb | 64 +++++++++++++++++++----------- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1f93e6aa..8f36bd8f 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -2,7 +2,7 @@ class HomeController < ApplicationController skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] def index - @employees = Employee.all.order("name asc") + @employees = Employee.all_emp_except_waiter.order("name asc") @login_form = LoginForm.new() end @@ -19,6 +19,8 @@ class HomeController < ApplicationController if @employee != nil session[:session_token] = @employee.token_session + #if cashier => already opening cahshier? + redirect_to origami_root_path else render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!" diff --git a/app/models/employee.rb b/app/models/employee.rb index 69eb3fae..1816c2e3 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -6,6 +6,10 @@ 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.all_emp_except_waiter + Employee.where('role!=?','waiter') + end + def self.collection Employee.select("id, name").map { |e| [e.name, e.id] } end diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 84b6f199..b9418d22 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -1,14 +1,24 @@ @@ -23,21 +33,29 @@ <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
      -
      - - - - - - - - - - - - - +
      +
      +
      +
      1
      +
      2
      +
      3
      +
      +
      +
      4
      +
      5
      +
      6
      +
      +
      +
      7
      +
      8
      +
      9
      +
      +
      CLR
      +
      0
      +
      ENT
      +
      +