git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yan
2017-10-27 11:40:39 +06:30
parent 18aa3d1e0f 1765a5dd36
commit 62ce53c978
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/home/dashboard.html.erb
View File

@@ -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,

4
app/views/settings/promotions/_form.html.erb
View File

@@ -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>