diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4a61c6e7..050231d3 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -29,6 +29,7 @@ //= require autosize/autosize.js //= require jquery-countto/jquery.countTo.js //= require raphael/raphael.min +//= require morrisjs/morris.js //= require chartjs/Chart.bundle.js //= require fileinput.min //= require BSBMaterial/admin.js @@ -36,7 +37,6 @@ //= require BSBMaterial/demo.js //= require custom.js - $(document).on('turbolinks:load', function() { $('.datetimepicker').bootstrapMaterialDatePicker({ format: 'DD-MM-YYYY - HH:mm', diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index dc4368d0..bb55203b 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -1,7 +1,6 @@ - $(document).on('turbolinks:load', function() { + // $("body").boostrapMaterialDesign(); - var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); $('#custom-slimscroll').slimScroll({ @@ -54,7 +53,7 @@ $(document).on('turbolinks:load', function() { var animateExit = $("#notify_message").attr('data-animate-exit'); var colorName = $("#notify_message").attr('data-color-name'); var text = $("#notify_message").attr('data-message'); - console.log(text); + if (text != null || colorName != null){ showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); } diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 24fe58ec..24c4aceb 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -68,7 +68,7 @@ class HomeController < ApplicationController @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count() @top_products = Sale.top_products(today) - @hourly_sales = Sale.hourly_sales(today) + @hourly_sales = Sale.hourly_sales(today).sum(:grand_total) # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p') # .sum(:grand_total) @employee_sales = Sale.employee_sales(today).sum(:grand_total) diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb index 46b0f3ee..bfd25efc 100755 --- a/app/models/dining_charge.rb +++ b/app/models/dining_charge.rb @@ -5,6 +5,7 @@ class DiningCharge < ApplicationRecord def self.amount_calculate(dining_charges_obj, checkin , checkout) # note :: the first Charge Block will cost all, the Time rounding block will included in 2nd Charge Block if !checkin.nil? && !checkout.nil? && !dining_charges_obj.nil? + block_count = 0 price = 0 minutes = DiningCharge.time_diff(checkout, checkin) free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.utc.localtime.strftime('%H:%M')) diff --git a/app/models/sale.rb b/app/models/sale.rb index 21fee04b..dd888fee 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -856,7 +856,9 @@ end end def self.hourly_sales(today) - query= Sale.select("grand_total").where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today) + query= Sale.select("grand_total") + .where('payment_status="paid" and sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today) + .group("date_format(receipt_date, '%I %p')") end def self.employee_sales(today) diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index f5915dc6..e0727a09 100755 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -124,8 +124,10 @@ datasets.push(val.total_item); backgroundColor.push(randomColorGenerator()); }); + + var ctx = $("#top_products").get(0).getContext("2d"); - var chart = new Chart("top_products", { + var chart = new Chart(ctx, { type: 'pie', data: { labels: labels, @@ -159,8 +161,9 @@ backgroundColor.push(randomColorGenerator()); }); + var ctx = $("#hourly_sales").get(0).getContext("2d"); - var myChart = new Chart("hourly_sales", { + var myChart = new Chart(ctx, { type: 'bar', data: { labels: labels, @@ -206,8 +209,9 @@ datasets.push(val); backgroundColor.push(randomColorGenerator()); }); + var ctx = $("#employee_sales").get(0).getContext("2d"); - var myChart = new Chart("employee_sales", { + var myChart = new Chart(ctx, { type: 'bar', data: { labels: labels, @@ -254,7 +258,9 @@ borderColor.push(randomColorGenerator()); }); - var myChart = new Chart("inventory", { + var ctx = $("#inventory").get(0).getContext("2d"); + + var myChart = new Chart(ctx, { type: 'line', data: { labels: labels, diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1a67d050..d6ca28cc 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -57,7 +57,6 @@

<% end %> <%= yield %> - + - \ No newline at end of file diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb index d5e9257e..db1a2aca 100755 --- a/app/views/settings/payment_method_settings/_form.html.erb +++ b/app/views/settings/payment_method_settings/_form.html.erb @@ -6,7 +6,7 @@
<%= f.input :payment_method %> - <%= f.input :is_active,:class=> "checkbox" %> + <%= f.input :is_active %> <%= f.input :gateway_communication_type %> <%= f.input :gateway_url %> <%= f.input :auth_token %> diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index 3730bc87..914c3324 100755 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -219,8 +219,8 @@ 7) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.type_txt") %>
8) <%= t("views.right_panel.detail.item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %>
9) <%= t("views.right_panel.detail.original_product") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.original_product_txt") %>
- 10) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %> - -------------------------------------------------------------------------------- + 10) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %>
+ -------------------------------------------------------------------
ADD PRODUCT
1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.product_txt") %>
2) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %>