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

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
NyanLinHtut
2020-03-04 11:58:43 +06:30
parent 82ab2c7ef0 f449a17dc7
commit 6b22c7116b
9 changed files with 191 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/assets/javascripts/addorder.js
View File

@@ -845,35 +845,42 @@ $(function() {
show_item_detail(item_data,"add_icon");
code = $(this).data('item-code');
element = $('#order-detail-slimscroll').find(`[data-code='${code}']`);
element = $('.summary-items').find(`[data-code='${code}']`);
item_qty = element.find('#item_qty').text()
parent = element.parents('.card-text')
// auto scroll to last order item
if (item_qty == 1) {
$('#order-detail-slimscroll').animate({
$(parent).animate({
scrollTop: $('.summary-items tbody tr:last').position().top - $('.summary-items tbody tr:first').position().top
})
}
// set border to current item
$('.summary-items tbody tr').css('background-color', '')
$('.summary-items tbody tr').css({
'background-color': '',
'color': ''
})
element.css({'background-color': '#2091F3'})
element.css({
'background-color': '#2091F3',
'color': '#fff'
})
// element.css('background-color', '#2091F3').delay(500)
// .queue(function() {
// $(this).css('background-color', '').dequeue();
// })
setTimeout(function() {
element.css('background-color', '');
}, 500);
calculate_sub_total();
if (isNotInView(element)) {
if (isNotInView(element, parent)) {
element.css({'background-color': '#2091F3'});
scrollToELement(element);
}
}); //End Add Icon Click
function isNotInView(elem){
function isNotInView(elem, parent){
// for scroll up | for scroll down
result = (($(elem).offset().top - 100) < $(elem).height() || $('#order-detail-slimscroll').height() < (elem.position().top + elem.outerHeight(true)));
result = (($(elem).offset().top - 100) < $(elem).height() || $(parent).height() < (elem.position().top + elem.outerHeight(true)));
console.log(result)
return result // reutn boolean
}
@@ -1082,7 +1089,8 @@ $(function() {
window.location.href = "/foodcourt/sale/"+result.data["sale_id"]+"/"+type+"/payment";
}
else{
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment";
module_name = window.location.pathname.includes('origami') ? 'origami' : 'foodcourt'
window.location.href = "/"+module_name+"/sale/"+result.data["sale_id"]+"/"+type+"/payment";
}
}
}

31
app/assets/javascripts/custom.js
View File

@@ -13,6 +13,37 @@ $(document).ready(function() {
touchScrollStep : 50
});
$('#foodcourt-slimscroll').slimScroll({
height: '100%',
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0',
touchScrollStep : 50
});
$('#foodcourt-order-slimscroll').slimScroll({
height: '100%',
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0',
touchScrollStep : 50
});
$('#foodcourt-menu-slimscroll').slimScroll({
height: '100%',
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0',
touchScrollStep : 50
});
$('#table-slimscroll').slimScroll({
height: height,
size: '5px',

3
app/assets/stylesheets/origami.scss
View File

@@ -30,7 +30,8 @@
}
section.content {
margin: 70px 5px 0 225px;
margin: 0 5px 0 5px;
padding: 64px 0 0 0;
}
.table {

44
app/assets/stylesheets/reset.css
View File

@@ -1,3 +1,22 @@
html, body {
height: 100%;
}
.content {
height: 100%;
}
.slimScrollDiv {
flex: 1 1 0!important;
}
.flex-grow-1 {
flex-grow: 1 !important;
}
.flex-1 {
flex: 1 !important;
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
@@ -93,7 +112,8 @@
}
section.content {
margin: 70px 15px 0 225px;
margin: 0 5px 0 5px;
padding: 64px 0 0 0;
}
.sidebar {
@@ -123,7 +143,7 @@ section.content {
.card .body {
font-size: 14px;
color: #555;
padding: 10px;
padding: 10px;
}
.card .card-header {
@@ -150,15 +170,15 @@ section.content {
}
.checkbox label input[type=checkbox], label.checkbox-inline input[type=checkbox] {
position: relative;
left: 0;
z-index: -1;
width: 13px;
height: 13px;
position: relative;
left: 0;
z-index: -1;
width: 13px;
height: 13px;
margin: 5px 5px 0 0;
overflow: hidden;
pointer-events: none;
opacity: 1;
opacity: 1;
}
@@ -178,8 +198,8 @@ section.content {
}
.btn:not(.btn-link):not(.btn-circle) span {
position: relative;
top: 0px;
margin-left: 0px;
top: 0px;
margin-left: 0px;
}
.nav {
padding-left: 0;
@@ -199,7 +219,7 @@ section.content {
}
.nav-tabs li a.active {
color: #000 !important;
color: #000 !important;
border-bottom: 2px solid #2196F3 !important;
}
@@ -330,4 +350,4 @@ div.online-order-margin > div > span {
}*/
/* order-no color */
/* *************************************************** */
/* *************************************************** */