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/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 252a2e5f..e48959ee 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") %>
+ -------------------------------------------------------------------