"
@@ -237,10 +238,10 @@ $(function() {
//instances = $(this).data('instance');
item_sets = $(this).data('item-sets');
instances = $(this).data('instances');
- // item_sets = $(data).attr('data-item-sets');
+ item_options = $(this).data('options');
for(var field in item_sets) {
-
+
$('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
value = item_sets[field]["instances"];
@@ -283,10 +284,20 @@ $(function() {
});
}
+ for(var j in item_options) {
+ value = item_options[j]["values"];
+ type = item_options[j]["type"];
+ row = "
";
+ });
+ $(".options-list").append(row);
+ }
$('.set-item').attr('data-code',instances[0]['code']);
$('.set-item').attr('data-name',instances[0]['name']);
$('.set-item').attr('data-price',instances[0]['price']);
- $('.set-item').attr('data-options','[]');
+ $('.set-item').attr('data-options','');
$('.set-item').attr('data-parent',true);
$('#set_change_qty').val(1);
@@ -341,6 +352,7 @@ $(function() {
sub_total = $('#set_total_price').text();
name = $(this).data('name');
price = $(this).data('price');
+ options = $(this).attr('data-options','');
// qty = $('#set_change_qty').val();
qty = document.getElementById("set_count").value;
total = qty*price;
@@ -369,52 +381,48 @@ $(function() {
item = get_set_item(items);
customer_display_view(item,"set_add");
-
+ var option = ''
attribute_arr = []
- option_arr = []
var rowCount = $('.summary-items tbody tr').length+1;
- option_arr = []
code = $('.set-item').attr('data-code');
name = $('.set-item').attr('data-name');
price = $('.set-item').attr('data-price');
- option = $('.set-item').attr('data-options');
+ option = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
parent = $('.set-item').attr('data-parent');
total = qty * price ;
- option_arr.push(option);
row ="
';
$(".summary-items tbody").append(row);
-
var rowCount = $('.summary-items tbody tr').length+1;
+ var set_option = ''
$(items).each(function(i){
code = $(items[i]).attr('data-code');
name = $(items[i]).attr('data-name');
price = $(items[i]).attr('data-price');
- option = $(items[i]).attr('data-options');
+ set_option = ($(items[i]).attr('data-options') === 'undefined') ? ' ' :$(items[i]).attr('data-options');
+
sub_item = $(items[i]).attr('data-sub-item');
- option = $(items[i]).attr('data-options');
total = qty * price ;
- option_arr.push(option);
row ="
"
+ +set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
+''+rowCount+' '
- +'' + item_name+ ' ' + name +' '
+ +'' + item_name+ ' ' + name +' ' + set_option +' '
+'' + qty + ' '
+''
+ parseFloat(total).toFixed(2)
@@ -626,8 +634,6 @@ $(function() {
if(group == "set_menu"){
- code = $(this).data('code');
- value = $(this).data('value');
instance = $(".selected-instance");
$(instance).each(function(i){
@@ -638,6 +644,12 @@ $(function() {
}
});
}
+
+ if(group == "set_menu_default"){
+ option_arr = get_selected_attributes('selected-option');
+ $('.set-item').attr('data-options',JSON.stringify(option_arr));
+ $('.set_default_option').text(option_arr);
+ }
}); //End selecct attribute buttom
@@ -650,7 +662,6 @@ $(function() {
attribute_arr = get_selected_attributes('selected-attribute');
option_arr = get_selected_attributes('selected-option');
-
if (item_row.length>0) {
var instances = jQuery.parseJSON(item_row.attr('data-instances'));
@@ -689,9 +700,9 @@ $(function() {
$('.add_to_order').attr('data-attributes',JSON.stringify(attribute_arr));
$('.add_to_order').attr('data-options',JSON.stringify(option_arr));
var item_data = $(this);
- item = get_item(item_data);
+ item = get_item(item_data,"add_to_order");
customer_display_view(item,"add");
- show_item_detail(item_data);
+ show_item_detail(item_data,"add_to_order");
calculate_sub_total();
}); //End add order Click
@@ -699,13 +710,13 @@ $(function() {
// click plus icon for add
$(document).on('click', '.add_icon', function(event){
var item_data = $(this);
- item = get_item(item_data);
+ item = get_item(item_data,"add_icon");
customer_display_view(item,"add");
- show_item_detail(item_data);
+ show_item_detail(item_data,"add_icon");
calculate_sub_total();
}); //End Add Icon Click
- function show_item_detail(data){
+ function show_item_detail(data,click_type){
qty = parseInt(data.attr('data-qty'));
append = 0;
@@ -717,23 +728,24 @@ $(function() {
}else{
instance = "("+data.attr('data-instance')+")";
}
-
- d_option = data.attr('data-options');
- if (d_option){
- option_name = "-"+data.attr('data-options');
+ d_option = data.attr('data-opt');
+ if (click_type != "add_icon"){
+ option_name = "-"+data.attr('data-options');
+ data_option = data.attr('data-options') ;
}else{
- option_name = '';
+ option_name = ' ';
+ data_option = '[]';
}
+
var rowCount = $('.summary-items tbody tr').length+1;
var item_row = $('.summary-items tbody tr');
$(item_row).each(function(i){
item_code = $(item_row[i]).attr('data-code');
instance_code = $(item_row[i]).attr('data-instance-code');
- r_option = $(item_row[i]).attr('data-options');
-
- if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option==d_option) {
+ r_option = $(item_row[i]).attr('data-opt');
+ if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) {
if (qty > 1) {
qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty;
}else{
@@ -757,9 +769,10 @@ $(function() {
+instance+ "' data-code='"+data.attr('data-item-code')+"' data-instance-code='"
+data.attr('data-instance-code')+"' data-attributes='"
+data.attr('data-attributes')+"' data-options ='"
+ +data_option+"' data-opt ='"
+data.attr('data-options')+"' data-row ='"+rowCount+ "'>"
+' '+rowCount+' '
- +'' + data.attr('data-name')+ ' ' + instance +' ' + option_name +' '
+ +'' + data.attr('data-name')+ ' ' + instance +''+option_name+' '
+'' + qty + ' '
+''
+ parseFloat(price).toFixed(2)
@@ -776,17 +789,17 @@ $(function() {
e.preventDefault();
$("#oqs_loading_wrapper").show();
- type = window.location.href.indexOf("quick_service");
- if (type != -1) {
+ quick_service = window.location.href.indexOf("quick_service");
+ if (quick_service != -1) {
type = 'quick_service'
- var table_type = $('#table_type').text();
+ var table_type = $('#table_type').text();
var table_id = $('#table_id').val();
var customer_id = $('#customer_id').val();
var booking_id = $('#booking_id').text();
var ajax_url = 'addorders/create';
}else{
type = 'cashier'
- var table_type = $('#table_type').text();
+ var table_type = $('#table_type').text();
var table_id = $('#table_id').text();
var customer_id = $('#customer_id').text();
var booking_id = $('#booking_id').text();
@@ -813,17 +826,17 @@ $(function() {
data: params,
dataType: "json",
success:function(result){
- customer_display_view(null,"reload");
if (type == "quick_service") {
- window.location.href = "/origami/quick_service"
+ window.location.href = "/origami/quick_service"
}else{
if(table_type == "Table"){
- window.location.href = "/origami/table/" + table_id
+ window.location.href = "/origami/table/" + table_id
}
else {
- window.location.href = "/origami/room/" + table_id
+ window.location.href = "/origami/room/" + table_id
}
}
+ customer_display_view(null,"reload");
}
});
// }else{
@@ -878,13 +891,24 @@ $(function() {
dataType: "json",
success:function(result){
if (result.status) {
+
if (result.data == null){
- window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+ swal({
+ title: "Please Open Shift !",
+ text: result.status,
+ type: "warning",
+ confirmButtonColor: "#DD6B55",
+ confirmButtonText: "Ok",
+ closeOnConfirm: false
+ }, function () {
+ window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+ });
+
}else{
window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
}
}
- }
+ }
});
});
@@ -1156,7 +1180,7 @@ $(function() {
for(var i in data) {
- row = '' ;
$(sub_category).append(row);
@@ -1169,7 +1193,7 @@ $(function() {
}
/* Get Item rows */
- function get_item(data){
+ function get_item(data,click_type){
var sale_items = [];
var sale_item = {};
@@ -1180,6 +1204,8 @@ $(function() {
sale_item.instance_code = data.attr('data-instance-code')
sale_item.attributes = data.attr('data-attributes')
sale_item.options = data.attr('data-options')
+ sale_item.opt = data.attr('data-opt')
+ sale_item.click_type = click_type
sale_item.instance = data.attr('data-instance')
sale_items.push(sale_item);
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 76341958..e486c152 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -104,6 +104,86 @@ $(document).ready(function() {
}
});
+ $("#shop_logo").fileinput({
+ previewFileType: "image",
+ allowedFileExtensions: ["jpg", "gif", "png"],
+ browseClass: "btn btn-success",
+ browseLabel: "Pick Image",
+ browseIcon: "\n' +
+ '
\n' +
+ '
\n' +
+ '
\n' +
+ '
\n' +
+ '
\n' +
+ '
\n' +
+ '
\n' +
+ '
'+rowCount+' '
+'' + items[i].name+ ' ' + instance + ' ' + option_name +' '
+'' + qty + ' '
@@ -84,8 +96,6 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', {
var attribute_arr = [];
var rowCount = $('.second_display_items tbody tr').length+1;
for(var i in items) {
-
-
code = items[i].code;
item_code = items[i].item_code;
name = items[i].name;
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index a2011022..778de553 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -9,7 +9,8 @@ $(document).ready(function() {
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
- railBorderRadius: '0'
+ railBorderRadius: '0',
+ touchScrollStep : 25
});
$('#order-detail-slimscroll').slimScroll({
@@ -18,7 +19,18 @@ $(document).ready(function() {
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
- railBorderRadius: '0'
+ railBorderRadius: '0',
+ touchScrollStep : 25
+ });
+
+ $('#menu-slimscroll').slimScroll({
+ height: height-$('#menu-slimscroll').attr('data-height'),
+ size: '5px',
+ color: 'rgba(0,0,0,0.5)',
+ alwaysVisible: false,
+ borderRadius: '0',
+ railBorderRadius: '0',
+ touchScrollStep : 25
});
// $('.delete').click(function(){
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 842b236b..f2219711 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -9,12 +9,37 @@
//= require bootstrap-notify/bootstrap-notify.js
//= require node-waves/waves.js
//= require sweetalert/sweetalert.min.js
+//= require fileinput.min
//= require cable
//= require turbolinks
//= require BSBMaterial/turbolink_admin.js
//= require BSBMaterial/demo.js
//= require custom.js
+
+$(document).on('turbolinks:load', function() {
+
+ $("#customer_image_path").fileinput({
+ previewFileType: "image",
+ allowedFileExtensions: ["jpg", "gif", "png"],
+ browseClass: "btn btn-success",
+ browseLabel: "Pick Image",
+ browseIcon: "\n' +
+ '
\n' +
+ '
<%= t("views.right_panel.detail.date_of_birth") %>
<%= f.text_field :date_of_birth, :value=>"01-01-1990",:class=>"datepicker form-control col-md-12"%>
+
+
\ No newline at end of file
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 3dd73a3d..865202b0 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -68,16 +68,48 @@