Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/channels/call_waiter.js

@@ -0,0 +1,61 @@
+App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
+//  App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+
+  connected: function() {},
+
+  disconnected: function() {},
+
+  received: function(data) {                 
+     console.log(data.table);
+ console.log(data.time);
+ table = data.table
+    // for Notificaiotn message
+  var placementFrom  = "top";
+  var placementAlign = "center";
+  var animateEnter   = "";
+  var animateExit    = "";
+  var colorName      = "alert-warning";
+  var text           = " Calling Waiter <br>  "+table.name ;
+
+  if (text != null || colorName != null){
+     showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
+  }
+
+  function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
+    if (colorName === null || colorName === '') { colorName = 'bg-black'; }
+    if (animateEnter === null || animateEnter === '') { animateEnter = 'animated fadeInDown'; }
+    if (animateExit === null || animateExit === '') { animateExit = 'animated fadeOutUp'; }
+    var allowDismiss = true;
+    $.notify({
+        message: text
+    },
+        {
+            type: colorName,
+            newest_on_top: true,
+            allow_dismiss: allowDismiss,
+            newest_on_top: true,
+            timer: 200000000000000,
+            placement: {
+                from: placementFrom,
+                align: placementAlign
+            },
+            animate: {
+                enter: animateEnter,
+                exit: animateExit
+            },
+            template: '<div data-notify="container" style="max-width: 180px !important;" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
+            '<button type="button" aria-hidden="true" class="close float-right m-l-20 m-t--5" data-notify="dismiss" style="right: -5px;">×</button>' +
+            '<span data-notify="icon"></span> ' +
+            '<span data-notify="title">{1}</span> ' +
+            '<span data-notify="message">{2}</span>' +
+            '<div class="progress" data-notify="progressbar">' +
+            '<div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>' +
+            '</div>' +
+            '<a href="{3}" target="{4}" data-notify="url"></a>' +
+            '</div>'
+        });
+   }
+  //end Notificaiotn message
+ }
+});
+

app/assets/stylesheets/reset.css

@@ -265,5 +265,13 @@ section.content {
     color: #F44336;
 }
 
+
+/*notification */
+.alert {
+    padding: .25rem .25rem !important;
+}
+.alert-dismissible .close {
+  padding: 0.2rem 0.24rem;
+}
 /* End Reset Theme */
 /* *************************************************** */

app/channels/application_cable/channel.rb

@@ -15,4 +15,9 @@ module ApplicationCable
 	class BillChannel < ActionCable::Channel::Base
 		
 	end
+
+	# Call Waiter Channel
+	class CallWaiterChannel < ActionCable::Channel::Base
+		
+	end
 end

app/channels/application_cable/connection.rb

@@ -1,7 +1,7 @@
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   	def connect
-  		logger.add_tags "ActionCable"
+  		logger.add_tags "SX-ActionCable"
   	end
   end
 end

app/channels/call_waiter_channel.rb

@@ -0,0 +1,14 @@
+class CallWaiterChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "call_waiter_channel"
+  end
+
+  def unsubscribed
+    stop_all_streams
+    # Any cleanup needed when channel is unsubscribed
+  end
+
+  def order(message)
+    # ToDo
+  end
+end

app/controllers/api/call_waiters_controller.rb

@@ -0,0 +1,12 @@
+class Api::CallWaitersController < ActionController::API
+
+  #List all active customers by name
+  def index
+    @table_id = params[:dining_id]
+    @time     = params[:time]
+    @table    = DiningFacility.find(@table_id)
+    CallWaiterJob.perform_later(@table,@time)
+  end
+
+  
+end

app/controllers/reports/receipt_no_controller.rb

@@ -22,9 +22,6 @@ authorize_resource :class => false
         @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
         @tax_profiles = TaxProfile.order('order_by asc')
 
-puts @sale_data.count
-puts "sssssss"
-puts @tax_profiles.to_json
         @from       = from
         @to         = to
 

app/controllers/reports/saleitem_controller.rb

@@ -17,6 +17,8 @@ class Reports::SaleitemController < BaseReportController
     end
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
 
+    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
+puts @sale_taxes.to_json
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
 
 

app/jobs/call_waiter_job.rb

@@ -0,0 +1,8 @@
+class CallWaiterJob < ApplicationJob
+  queue_as :default
+
+  def perform(table,time)    
+     ActionCable.server.broadcast "call_waiter_channel",table: table,time:time
+     # Rails.logger.debug "Testing: I'm performing my job with arguments: #{table}"
+  end
+end

app/views/api/call_waiters/index.json.jbuilder

@@ -0,0 +1,6 @@
+if (@table)
+  json.table_id @table.id
+  json.name @table.name
+  json.type @table.type
+  json.time @time
+end

app/views/reports/saleitem/index.html.erb

@@ -60,7 +60,8 @@
 							<% total_amount = 0 %>
 							<% discount = 0 %>
 							<% total_item_foc = 0 %>
-							<% total_item_dis = 0 %>
+							<% total_item_dis = 0.0 %>
+							<% total_tax = 0 %>
 
 							<% @sale_data.each do |sale| %>
 
@@ -153,7 +154,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span class="underline"><%= other_sub_total %></span></td>
+									<td ><span><%= other_sub_total %></span></td>
 								</tr>
 						
 							<!-- End Other Charges -->
@@ -161,8 +162,8 @@
 								<td colspan="3">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
-								<td><%= t("views.right_panel.detail.net_amount") %></td>
-								<td><span><%= grand_total%></span></td> 
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= grand_total%></span></td> 
 							</tr>
 							<% end %>
 
@@ -173,8 +174,8 @@
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_dis %></span></td>
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= total_item_dis %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
@@ -183,9 +184,31 @@
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= @discount_data %></span></td>
-							</tr>		
+								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
+								<td style="border-bottom:2px solid grey;"><span><%= @discount_data %></span></td>
+							</tr>	
+							
+								<% @sale_taxes.each do |tax| %>
+								<tr>
+								    <td colspan="5">&nbsp;</td>
+									<td><%= tax.tax_name %></td>
+									<td><%= tax.st_amount.round(2) %>
+										<%total_tax += tax.st_amount%>
+									</td>
+								</tr>
+							<% end %>
+							<tr>
+								<td colspan="5">&nbsp;</td>
+								<td style="border-top:2px solid grey;">Net Amount</td>
+								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
+								<td style="border-top:2px solid grey;"><%= grand_total + total_tax%></td> 
+							</tr>
+							<!-- <tr>
+								<td colspan="5">&nbsp;</td>
+								<td>Grand Total</td>
+							
+								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
+							</tr>	 -->
 						</tbody>
 					</table>
 				</div>

config/routes.rb

@@ -71,7 +71,10 @@ scope "(:locale)", locale: /en|mm/ do
       get "check_in/:dining_id" => "check_in_process#check_in_time"
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
+      post "call_waiter" => "call_waiters#index"
     end
+
+    
   end
 
   #--------- Cashier ------------#

spec/jobs/call_waiter_job_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CallWaiterJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end