From a57b0760fb59dcbbdca3daad5f64dbb7e215c406 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 27 Oct 2017 11:13:36 +0630
Subject: [PATCH 1/2] change right panel text for promotion

---
 app/views/settings/promotions/_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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") %> <br>
         8) <%= t("views.right_panel.detail.item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %> <br>
         9) <%= t("views.right_panel.detail.original_product") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.original_product_txt") %> <br>
-        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") %> <br>
+        -------------------------------------------------------------------
         <h5>ADD PRODUCT</h5>
         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") %> <br>
         2) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %> <br>

From 1765a5dd368f8e4373e015f430ffd77ef2e9e0b4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 27 Oct 2017 11:39:51 +0630
Subject: [PATCH 2/2] fix dashboard js error

---
 app/views/home/dashboard.html.erb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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,