fixed conflic

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,

app/views/layouts/application.html.erb

@@ -57,7 +57,6 @@
             </p>
         <% end %>       
         <%= yield %>     
-    </section>
+    </section>        
 </body>
-
 </html>

app/views/settings/payment_method_settings/_form.html.erb

@@ -6,7 +6,7 @@
 
     <div class="form-inputs p-l-15">
       <%= 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 %>

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>