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

merge with staging

Browse Source
This commit is contained in:
Yan
2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,9 +71,9 @@
</div>
</div>
</div>
</div>
<br><br>
<div class="row">
</div>
<br><br>
<div class="row">
<div class="col-md-6">
<div class="panel">
<div class="panel-heading"><h4>Hourly Sales</h4></div>
@@ -90,28 +90,11 @@
</div>
</div>
</div>
</div>
<% end %>
</div>
<% end %>
</div>
<!-- <div class="footer" style="background-color: inherit">
<div class="card">
<div class="page-header center-text">
<h4 class="footer-header">
<%= @shop.name %>
</h4>
</div>
<div class="center-text">
<%= @shop.address %>
</div>
<div class="center-text">
<%= @shop.phone_no %>
</div>
>>>>>>> chart
</div>
</div> -->
<script src="js/Chart.js"></script>
<!-- <script src="js/Chart.js"></script> -->
<script>
$(document).ready(function(){
var top_products = JSON.parse('<%= @top_products.to_json.html_safe %>');

3
app/views/home/index.html.erb
View File

@@ -148,12 +148,13 @@
console.log($(this).data("formid"));
var item = $(this).data("formid");
$(item).submit();
});
// Add minus icon for collapse element which is open by default
$(".collapse.in").each(function () {
$(this).siblings(".panel-heading").find(".glyphicon").addClass("glyphicon-minus").removeClass("glyphicon-plus");
});
// Toggle plus minus icon on show hide of collapse element
$(".collapse").on('show.bs.collapse', function () {
$(this).parent().find(".glyphicon").removeClass("glyphicon-plus").addClass("glyphicon-minus");

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

@@ -39,18 +39,18 @@
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function () {
$(".pin_pad").click(function (event) {
event.preventDefault();
console.log($(this).data("value"));
$(document).ready(function() {
$(".pin_pad").click(function(event) {
event.preventDefault();
var old_value = $("#login_form_password").val();
var value = $(this).data("value");
console.log(old_value);
console.log(value);
if (value == "CLR") {
$("#login_form_password").val("");
} else if (value == "ENT") {
$("#new_login_form").submit();
} else {
var old_value = $("#login_form_password").val();
} else {
$("#login_form_password").val(old_value + value);
}
});