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

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

Browse Source
This commit is contained in:
Yan
2017-10-24 18:23:16 +06:30
parent fa554067a3 0eea755acd
commit 82d48f8246
31 changed files with 263 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/CRM.js
View File

@@ -16,9 +16,22 @@
//= require bootstrap/js/bootstrap-material-design.min //= require bootstrap/js/bootstrap-material-design.min
//= require jquery_ujs //= require jquery_ujs
//= require turbolinks //= require turbolinks
//= require momentjs/moment
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
//= require jquery-slimscroll/jquery.slimscroll.js //= require jquery-slimscroll/jquery.slimscroll.js
//= require node-waves/waves.js //= require node-waves/waves.js
//= require sweetalert/sweetalert.min.js //= require sweetalert/sweetalert.min.js
//= require BSBMaterial/admin.js //= require BSBMaterial/admin.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require custom.js //= require custom.js
$(document).on('turbolinks:load', function() {
$('.datepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY',
clearButton: true,
weekStart: 1,
time: false
});
});

2
app/assets/javascripts/application.js
View File

@@ -59,7 +59,7 @@ $(document).on('turbolinks:load', function() {
}); });
}); });
$(function(){ $(document).on('turbolinks:load', function() {
// Image Upload // Image Upload
$("#simple_menu_item_image_path").fileinput({ $("#simple_menu_item_image_path").fileinput({

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

@@ -1,5 +1,5 @@
$(function(){ $(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign(); $('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));

8
app/views/origami/addorders/detail.html.erb
View File

@@ -3,7 +3,7 @@
<div id="loading_wrapper" style="display:none;"> <div id="loading_wrapper" style="display:none;">
<div id="loading"></div> <div id="loading"></div>
</div> </div>
<div class="row"> <div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" > <ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %> <% @menu.each do |menu| %>
@@ -19,17 +19,17 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="col-md-7 col-lg-7 col-sm-7"> <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
<div class="card-columns custom-card-columns menu_items_list" style="column-gap: 10px;"> <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 10px;">
<!-- append data --> <!-- append data -->
</div> </div>
</div> </div>
<div class="col-md-3 col-lg-3 col-sm-3"> <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
<button type="button" class="btn btn-primary btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br> <button type="button" class="btn btn-primary btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br>
<div class="card-header"> <div class="card-header">
<div> <div>
<strong id="order-title">ORDER DETAILS </strong> | Table <%=@table.name%> <strong id="order-title">ORDER DETAILS </strong>| Table<%=@table.name%>
<p class="hidden" id="table_id"><%=@table_id%></p> <p class="hidden" id="table_id"><%=@table_id%></p>
<p class="hidden" id="table_type"><%=@table.type%></p> <p class="hidden" id="table_type"><%=@table.type%></p>
<p class="hidden" id="booking_id"><%=@booking_id%></p> <p class="hidden" id="booking_id"><%=@booking_id%></p>

4
app/views/origami/home/show.html.erb
View File

@@ -127,7 +127,7 @@
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title"> <div class="card-title">
<div class="row"> <div class="row p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
Receipt No: <span id="receipt_no"> Receipt No: <span id="receipt_no">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
@@ -142,7 +142,7 @@
<br> <br>
</div> </div>
</div> </div>
<div class="row"> <div class="row p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p> <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>

54
app/views/origami/movetable/move_dining.html.erb
View File

@@ -220,17 +220,22 @@ $(document).ready(function(){
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
var change_from = "<%= @dining.id %>"; var change_from = "<%= @dining.id %>";
if (dining_id == change_from) { if (dining_id == change_from) {
$.alert({ /*$.alert({
title: 'Alert!', title: 'Alert!',
content: 'Please Select Another Table', content: 'Please Select Another Table',
type: 'red', type: 'red',
typeAnimated: true, typeAnimated: true,
btnClass: 'btn-danger', btnClass: 'btn-danger',
}); });*/
}else{ swal({
$('#moved').text(" ' " + dining_name + " ' ") title: "Alert!!",
$('#change_table_value').val(dining_id); text: 'Please Select Another Table !',
} type: 'warning',
});
}else{
$('#moved').text(" ' " + dining_name + " ' ")
$('#change_table_value').val(dining_id);
}
}) })
@@ -241,13 +246,11 @@ $(document).ready(function(){
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
var change_from = "<%= @dining.id %>"; var change_from = "<%= @dining.id %>";
if (dining_id == change_from) { if (dining_id == change_from) {
$.alert({ swal({
title: 'Alert!', title: "Alert!!",
content: 'Please Select Another Table', text: 'Please Select Another Table !',
type: 'red', type: 'warning',
typeAnimated: true, });
btnClass: 'btn-danger',
});
}else{ }else{
$('#moved').text(dining_name) $('#moved').text(dining_name)
$('#change_table_value').val(dining_id); $('#change_table_value').val(dining_id);
@@ -258,18 +261,29 @@ $(document).ready(function(){
change_to = $('#change_table_value').val(); change_to = $('#change_table_value').val();
change_from = "<%= @dining.id %>"; change_from = "<%= @dining.id %>";
if (change_to == ""){ if (change_to == ""){
alert("Please Select Table") swal({
title: "Alert!!",
text: 'Please Select Table !',
type: 'warning',
});
}else{ }else{
$.ajax({type: "POST", $.ajax({type: "POST",
url: "<%= origami_moving_path %>", url: "<%= origami_moving_path %>",
data: "change_from="+ change_from + "&change_to=" + change_to, data: "change_from="+ change_from + "&change_to=" + change_to,
success:function(result){ success:function(result){
alert("Moving Success")
if (result.get_type == 'Table'){ swal({
window.location.href = '/origami/table/' + change_to; title: "Information!",
}else{ text: 'Moving Success',
window.location.href = '/origami/room/' + change_to; type: 'success',
} }, function (){
if (result.get_type == 'Table'){
window.location.href = '/origami/table/' + change_to;
}else{
window.location.href = '/origami/room/' + change_to;
}
});
} }
}); });
} }

10
app/views/origami/orders/show.html.erb
View File

@@ -127,18 +127,18 @@
<div><strong id="order-title">ORDERS DETAILS </strong></div> <div><strong id="order-title">ORDERS DETAILS </strong></div>
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title row"> <div class="card-title row p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<p> Receipt No: <span id="receipt_no"> Receipt No: <span id="receipt_no">
</span></p> </span>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> Date: <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
</div> </div>
</div> </div>
<div class="card-title row customer_detail hide"> <div class="card-title row customer_detail hide">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<p>Customer : <span id="customer_name"></span></p> Customer : <span id="customer_name"></span>
</div> </div>
</div> </div>

14
app/views/origami/rooms/show.html.erb
View File

@@ -130,27 +130,27 @@
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title row"> <div class="card-title row p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<p> Receipt No: <span id="receipt_no"> Receipt No: <span id="receipt_no">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<%= @obj_sale.receipt_no rescue '' %> <%= @obj_sale.receipt_no rescue '' %>
<% end %> <% end %>
</span></p> </span>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"><%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> Date: <span id="receipt_date"><%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
</div> </div>
</div> </div>
<div class="card-title row customer_detail"> <div class="card-title row customer_detail p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p> <p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p>
<p>Customer : <%= @obj_sale_sale.customer.name rescue '-' %></p> Customer : <%= @obj_sale_sale.customer.name rescue '-' %>
<%else%> <%else%>
<p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p> <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
<p>Customer : <%= @customer.name rescue "-" %></p> Customer : <%= @customer.name rescue "-" %>
<%end%> <%end%>
</div> </div>

13
app/views/origami/sales/show.html.erb
View File

@@ -112,20 +112,19 @@
<div><strong id="order-title">INVOICE DETAILS </strong></div> <div><strong id="order-title">INVOICE DETAILS </strong></div>
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title row"> <div class="card-title row p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<p> Receipt No: <span id="receipt_no"> Receipt No: <span id="receipt_no">
<%= @sale.receipt_no rescue '' %> <%= @sale.receipt_no rescue '' %>
</span></p> </span>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> Date: <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
</div> </div>
</div> </div>
<div class="card-title row customer_detail"> <div class="card-title row customer_detail p-l-5 p-r-5">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
Customer : <%= @sale.customer.name rescue "-" %>
<p>Customer : <%= @sale.customer.name rescue "-" %></p>
</div> </div>

14
app/views/settings/item_sets/index.html.erb
View File

@@ -11,7 +11,19 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
<div class="m-b-10 clearfix"> <div class="m-b-10 clearfix">
<%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %> <%= link_to t("views.btn.new"),new_settings_item_set_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
</div> </div>

9
app/views/settings/menu_categories/index.html.erb
View File

@@ -11,11 +11,12 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> --> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> --> <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -44,7 +45,7 @@
<td><%= settings_menu_category.order_by rescue ''%></td> <td><%= settings_menu_category.order_by rescue ''%></td>
<td><%= settings_menu_category.parent.name rescue ''%></td> <td><%= settings_menu_category.parent.name rescue ''%></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %> <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to t("views.btn.delete"), settings_menu_category_path(settings_menu_category), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td></td> </td></td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>

25
app/views/settings/menu_categories/show.html.erb
View File

@@ -12,13 +12,14 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> --> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> --> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
</ul> <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul>
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7"> <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
@@ -31,8 +32,8 @@
<th>Menu</th> <th>Menu</th>
<th>Name</th> <th>Name</th>
<th>Alt name</th> <th>Alt name</th>
<th>Is Available</th> <th>Available</th>
<th>Order by</th> <!-- <th>Order by</th> -->
<th>Created At</th> <th>Created At</th>
<th>Actions</th> <th>Actions</th>
</tr> </tr>
@@ -44,10 +45,10 @@
<td><%= @settings_menu_category.name rescue "-" %></td> <td><%= @settings_menu_category.name rescue "-" %></td>
<td><%= @settings_menu_category.alt_name %></td> <td><%= @settings_menu_category.alt_name %></td>
<td><%= settings_menu_category.is_available rescue false%></td> <td><%= settings_menu_category.is_available rescue false%></td>
<td><%= @settings_menu_category.order_by %></td> <!-- <td><%= @settings_menu_category.order_by %></td> -->
<td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td> <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %></td> <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>
<td>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_path(@settings_menu_category)%>" data-method="delete"> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_path(@settings_menu_category)%>" data-method="delete">
<%= t("views.btn.delete") %> <%= t("views.btn.delete") %>
</button> </button>

11
app/views/settings/menu_item_attributes/index.html.erb
View File

@@ -12,11 +12,12 @@
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>

8
app/views/settings/menu_item_instances/_form.html.erb
View File

@@ -1,12 +1,12 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9"> <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %> <%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="col-md- panel"> <div class="col-md- panel">
<div class="form-group"> <div class="form-group p-l-15">
<%= f.input :item_instance_code %> <%= f.input :item_instance_code %>
<%= f.input :item_instance_name %> <%= f.input :item_instance_name %>
<%= f.input :price %> <%= f.input :price %>
@@ -28,13 +28,13 @@
</div> </div>
</div> </div>
<div class="form-actions"> <div class="form-actions p-l-15">
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3"> <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card"> <div class="card">
<div class="body"> <div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod

12
app/views/settings/menu_item_instances/index.html.erb
View File

@@ -83,13 +83,13 @@
<td><%=l settings_menu_item.created_at, :format => :short %></td> <td><%=l settings_menu_item.created_at, :format => :short %></td>
<% if settings_menu_item.type == "SimpleMenuItem" %> <% if settings_menu_item.type == "SimpleMenuItem" %>
<td><%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %></td> <td><%= link_to t("views.btn.show"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ),:class=>"btn btn-primary waves-effect btn-sm" %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %></td> <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item),:class=>"btn btn-info waves-effect btn-sm" %></td>
<td><%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td> <td><%= link_to t("views.btn.delete"), settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class=>"btn btn-danger waves-effect btn-sm" %></td>
<% else %> <% else %>
<td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %></td> <td><%= link_to t("views.btn.show"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ),,:class=>"btn btn-primary waves-effect btn-sm" %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %></td> <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item),,:class=>"btn btn-info waves-effect btn-sm" %></td>
<td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td> <td><%= link_to t("views.btn.delete"), settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },,:class=>"btn btn-danger waves-effect btn-sm" %></td>
<% end %> <% end %>
</tr> </tr>
<% end %> <% end %>

38
app/views/settings/menu_item_instances/show.html.erb
View File

@@ -28,30 +28,37 @@
<div class="card-block"> <div class="card-block">
<h4 class="card-title">Menu Item Instance</h4> <h4 class="card-title">Menu Item Instance</h4>
<table class="table"> <table class="table">
<thead>
<tr>
<th>Item Instance code</th>
<th>Name</th>
<th>Price</th>
<th>On Promotion</th>
<th>Promotion Price</th>
<th>Available</th>
<th>Is Default</th>
<th>Created At</th>
</tr>
</thead>
<tbody> <tbody>
<tr>
<tr><th>Item Instance code</th>
<td><%= @settings_menu_item_instances.item_instance_code %></td> <td><%= @settings_menu_item_instances.item_instance_code %></td>
</tr>
<tr><th>Name</th>
<td><%= @settings_menu_item_instances.item_instance_name rescue "-" %></td> <td><%= @settings_menu_item_instances.item_instance_name rescue "-" %></td>
</tr>
<tr><th>Price</th>
<td><%= @settings_menu_item_instances.price %></td> <td><%= @settings_menu_item_instances.price %></td>
</tr>
<tr><th>On Promotion</th>
<td><%= @settings_menu_item_instances.is_on_promotion %></td> <td><%= @settings_menu_item_instances.is_on_promotion %></td>
</tr>
<tr><th>Promotion Price</th>
<td><%= @settings_menu_item_instances.promotion_price %></td> <td><%= @settings_menu_item_instances.promotion_price %></td>
</tr>
<tr><th>Available</th>
<td><%= @settings_menu_item_instances.is_available %></td> <td><%= @settings_menu_item_instances.is_available %></td>
</tr>
<tr><th>Is Default</th>
<td><%= @settings_menu_item_instances.is_default %></td> <td><%= @settings_menu_item_instances.is_default %></td>
</tr>
<tr><th>Created At</th>
<td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> <td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
</tr>
</tbody>
<% if params[:simple_menu_item_id] %> <% if params[:simple_menu_item_id] %>
<!-- td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td> <!-- td><%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td>
<td><button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete"> <td><button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_simple_menu_item_menu_item_instance_path(@item, @settings_menu_item_instances)%>" data-method="delete">
@@ -76,8 +83,7 @@
</td>--> </td>-->
<% end %> <% end %>
</tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>

11
app/views/settings/menu_item_options/index.html.erb
View File

@@ -13,11 +13,12 @@
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>

5
app/views/settings/menus/index.html.erb
View File

@@ -12,11 +12,12 @@
<br><br> <br><br>
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> --> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> --> <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>

14
app/views/settings/menus/show.html.erb
View File

@@ -12,11 +12,14 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> --> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> --> <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul>
</ul> </ul>
</div> </div>
</div> </div>
@@ -33,7 +36,7 @@
<th>Valid To</th> <th>Valid To</th>
<th>Created By</th> <th>Created By</th>
<th>Created At</th> <th>Created At</th>
<th colspan="2">Actions</th> <th >Actions</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -43,9 +46,8 @@
<td><%= @settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td> <td><%= @settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td>
<td><%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td> <td><%= @settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
<td><%= @settings_menu.created_by %></td> <td><%= @settings_menu.created_by %></td>
<td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> <td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %></td> <td><%= link_to t("views.btn.edit"), edit_settings_menu_path(@settings_menu),:class => 'btn btn-primary btn-sm waves-effect' %>
<td>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_path(@settings_menu)%>" data-method="delete"> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_path(@settings_menu)%>" data-method="delete">
<%= t("views.btn.delete") %> <%= t("views.btn.delete") %>
</button> </button>

11
app/views/settings/set_menu_items/index.html.erb
View File

@@ -23,11 +23,12 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>

40
app/views/settings/set_menu_items/show.html.erb
View File

@@ -13,11 +13,12 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -25,15 +26,16 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<h4 class="card-title">Menu Item </h4> <h4 class="card-title">Menu Item </h4>
<table class="table"> <div class="body table-responsive">
<table class="table">
<thead> <thead>
<tr> <tr>
<th>Item code</th> <th>Item code</th>
<th>Name</th> <th>Name</th>
<th>Alt name</th> <!-- <th>Alt name</th> -->
<th>Type</th> <th>Type</th>
<th>Account Type</th> <th>Account Type</th>
<th>Menu category</th> <!-- <th>Menu category</th> -->
<th>Min qty</th> <th>Min qty</th>
<th>Created At</th> <th>Created At</th>
<th>Action</th> <th>Action</th>
@@ -44,12 +46,12 @@
<tr> <tr>
<td><%= @settings_menu_item.item_code %></td> <td><%= @settings_menu_item.item_code %></td>
<td><%= @settings_menu_item.name rescue "-" %></td> <td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td> <!-- <td><%= @settings_menu_item.alt_name %></td> -->
<td><%= @settings_menu_item.type %></td> <td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.account.title %></td> <td><%= @settings_menu_item.account.title %></td>
<td><%= @settings_menu_item.menu_category_id %></td> <!-- <td><%= @settings_menu_item.menu_category_id %></td> -->
<td><%= @settings_menu_item.min_qty %></td> <td><%= @settings_menu_item.min_qty %></td>
<td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %> <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-info btn-sm waves-effect' %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_set_menu_item_path(@category, @settings_menu_item)%>" data-method="delete"> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_set_menu_item_path(@category, @settings_menu_item)%>" data-method="delete">
<%= t("views.btn.delete") %> <%= t("views.btn.delete") %>
@@ -63,6 +65,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
@@ -82,8 +85,8 @@
<th>Instance name</th> <th>Instance name</th>
<th>Attributes</th> <th>Attributes</th>
<th>price</th> <th>price</th>
<th>Promotion</th> <!-- <th>Promotion</th>
<th>promotion price</th> <th>promotion price</th> -->
<!-- <th>Created at</th> --> <!-- <th>Created at</th> -->
<th>Actions</th> <th>Actions</th>
@@ -97,13 +100,13 @@
<td><%= settings_menu_item.item_instance_code %></td> <td><%= settings_menu_item.item_instance_code %></td>
<td><%= settings_menu_item.item_instance_name %></td> <td><%= settings_menu_item.item_instance_name %></td>
<td><%= settings_menu_item.item_attributes %></td> <td><%= settings_menu_item.item_attributes %></td>
<td><%= settings_menu_item.price %></td> <td><%= settings_menu_item.price %></td><!--
<td><%= settings_menu_item.is_on_promotion %></td> <td><%= settings_menu_item.is_on_promotion %></td>
<td><%= settings_menu_item.promotion_price %></td> <td><%= settings_menu_item.promotion_price %></td> -->
<!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> --> <!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
<td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %> <td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
<%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %></td> <!-- <%= link_to t("views.btn.delete"), settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect' %>--></td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>
@@ -114,10 +117,7 @@
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3"> <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="card"> <div class="card">
<div class="body"> <div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
</div> </div>
</div> </div>
</div> </div>

11
app/views/settings/simple_menu_items/index.html.erb
View File

@@ -24,11 +24,12 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>

31
app/views/settings/simple_menu_items/show.html.erb
View File

@@ -14,11 +14,12 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card"> <div class="card">
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu Categories', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<li class="list-group-item"><%= link_to 'Item Set', dashboard_path %></li> <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -26,17 +27,18 @@
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<h4 class="card-title">Menu Item </h4> <h4 class="card-title">Menu Item </h4>
<div class="body table-responsive">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th>Item code</th> <th>Item code</th>
<th>Name</th> <th>Name</th>
<th>Alt name</th> <!-- <th>Alt name</th> -->
<th>Type</th> <th>Type</th>
<th>Accout</th> <th>Accout</th>
<th>Menu category</th> <!-- <th>Menu category</th> -->
<!-- <th>Menu item</th> --> <!-- <th>Menu item</th> -->
<th>Min qty</th> <!-- <th>Min qty</th> -->
<!-- <th>Min selectable item</th> <!-- <th>Min selectable item</th>
<th>Max selectable item</th> --> <th>Max selectable item</th> -->
<th>Created At</th> <th>Created At</th>
@@ -48,15 +50,15 @@
<tr> <tr>
<td><%= @settings_menu_item.item_code %></td> <td><%= @settings_menu_item.item_code %></td>
<td><%= @settings_menu_item.name rescue "-" %></td> <td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td> <!-- <td><%= @settings_menu_item.alt_name %></td> -->
<td><%= @settings_menu_item.type %></td> <td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.account.title %></td> <td><%= @settings_menu_item.account.title %></td>
<td><%= @settings_menu_item.menu_category_id %></td> <!-- <td><%= @settings_menu_item.menu_category_id %></td> -->
<td><%= @settings_menu_item.min_qty %></td> <!-- <td><%= @settings_menu_item.min_qty %></td> -->
<td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td> <td><%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d") %></td>
<td colspan="2"> <td colspan="">
<%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@category, @settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_simple_menu_item_path(@category)%>" data-method="delete"> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_simple_menu_item_path(@category)%>" data-method="delete">
<%= t("views.btn.delete") %> <%= t("views.btn.delete") %>
@@ -70,6 +72,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
@@ -110,8 +113,8 @@
<!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> --> <!-- <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
<td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-lg waves-effect' %> <td><%= link_to 'Show', settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-lg waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_simple_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
</td> </td>
</tr> </tr>
<% end %> <% end %>

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

@@ -5,14 +5,14 @@
<%= simple_form_for([:settings, @settings_tax_profile ]) do |f| %> <%= simple_form_for([:settings, @settings_tax_profile ]) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <div class="form-inputs p-l-15">
<%= f.input :name %> <%= f.input :name %>
<%= f.input :rate %> <%= f.input :rate %>
<%= f.input :inclusive %> <%= f.input :inclusive %>
<%= f.input :order_by %> <%= f.input :order_by %>
</div> </div>
<div class="form-actions"> <div class="form-actions p-l-15">
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
</div> </div>
<% end %> <% end %>

2
app/views/settings/tax_profiles/index.html.erb
View File

@@ -35,7 +35,7 @@
<td><%= settings_tax_profile.order_by %></td> <td><%= settings_tax_profile.order_by %></td>
<td><%= settings_tax_profile.created_by %></td> <td><%= settings_tax_profile.created_by %></td>
<td><%= link_to t("views.btn.show"), settings_tax_profile_path(settings_tax_profile), :class => "btn btn-info btn-sm waves-effect" %> <td><%= link_to t("views.btn.show"), settings_tax_profile_path(settings_tax_profile), :class => "btn btn-info btn-sm waves-effect" %>
<%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-lg waves-effect' %></td> <%= link_to t("views.btn.edit"), edit_settings_tax_profile_path(settings_tax_profile),:class => 'btn btn-info btn-sm waves-effect' %></td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>

2
app/views/settings/tax_profiles/new.html.erb
View File

@@ -1,4 +1,4 @@
<%= link_to 'Back', settings_tax_profiles_path %> -->
<div class="page-header"> <div class="page-header">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>

6
app/views/settings/tax_profiles/show.html.erb
View File

@@ -1,10 +1,10 @@
<div class="page-header"> <div class="page-header">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= settings_tax_profile_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_tax_profile_path %>">Tax Profiles</a></li> <li class="breadcrumb-item"><a href="<%= settings_tax_profiles_path %>">Tax Profiles</a></li>
<li class="breadcrumb-item active">Details</li> <li class="breadcrumb-item active">Details</li>
<span class="float-right"> <span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profile_path %> <%= link_to t('.back', :default => t("views.btn.back")), settings_tax_profiles_path %>
</span> </span>
</ol> </ol>
</div> </div>

31
app/views/transactions/credit_notes/index.html.erb
View File

@@ -11,19 +11,19 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="main-box-body clearfix"> <div class="main-box-body clearfix p-l-5 p-r-5">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-">
<thead> <theadtbody>
<tr> <tr>
<td colspan="8"> <td colspan="">
<%= form_tag transactions_credit_notes_path, :method => :get do %> <%= form_tag transactions_credit_notes_path, :method => :get do %>
<div class="form-group col-md-4"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<label>Enter Keywords</label> <label>Enter Keywords</label>
<input type="text" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px"> <input type="text" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
</div> </div>
<div class="form-group col-md-2"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<label>Select Customer</label> <label>Select Customer</label>
<select class="selectpicker form-control col-md-12" name="customer" style="height: 40px" > <select class="selectpicker form-control col-md-12" name="customer" style="height: 40px" >
<option value="">Select Customer</option> <option value="">Select Customer</option>
@@ -33,22 +33,32 @@
<%end %> <%end %>
</select> </select>
</div> </div>
<div class="form-group col-md-2"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<label class="">From</label> <label class="">From</label>
<input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date"> <input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date">
</div> </div>
<div class="form-group col-md-2"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<label class="">To</label> <label class="">To</label>
<input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date"> <input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date">
</div> </div>
<div class="form-group col-md-1"> <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
<label> &nbsp;</label> <label> &nbsp;</label>
<input type="submit" value="Search" class='btn btn-primary btn-md'> <input type="submit" value="Search" class='btn btn-primary btn-md'>
</div> </div>
<% end %> <% end %>
</td> </td>
</tr> </tr>
</tbody>
</table>
</div>
<div class="card">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr> <tr>
<th>Sale Id </th> <th>Sale Id </th>
<th>Receipt no </th> <th>Receipt no </th>
@@ -82,6 +92,7 @@
<br> <br>
</div> </div>
</div>
</div> </div>
</div> </div>

12
app/views/transactions/orders/index.html.erb
View File

@@ -10,7 +10,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="main-box-body clearfix "> <div class="main-box-body clearfix p-l-15 p-r-15">
<%= form_tag transactions_orders_path, :method => :get do %> <%= form_tag transactions_orders_path, :method => :get do %>
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
@@ -36,13 +36,14 @@
</div> </div>
<div class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1"> <div class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1">
<label > &nbsp;</label> <label > &nbsp;</label>
<input type="submit" value="Search" class='btn btn-primary btn-md'> <br> <input type="submit" value="Search" class='btn btn-primary btn-md'>
</div> </div>
</div> </div>
<% end %> <% end %>
<div class="table-responsive"> <div class="card">
<table class="table table-striped"> <div class="table-responsive">
<table class="table ">
<thead> <thead>
<tr> <tr>
@@ -76,6 +77,7 @@
<%= paginate @orders %> <%= paginate @orders %>
<%end%> <%end%>
</div> </div>
</div>
</div> </div>
</div> </div>

2
app/views/transactions/orders/show.html.erb
View File

@@ -12,7 +12,7 @@
<div class="row"> <div class="row">
<div class="col-lg-11 col-md-11 col-sm-11"> <div class="col-lg-11 col-md-11 col-sm-11">
<div class="main-box-body clearfix"> <div class="main-box-body clearfix p-l-5 p-r-5">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>

23
app/views/transactions/sales/index.html.erb
View File

@@ -8,11 +8,11 @@
</ol> </ol>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="main-box-body clearfix"> <div class="main-box-body clearfix p-l-5 p-r-5">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-">
<thead> <tbody>
<tr> <tr>
<td colspan="8"> <td colspan="8">
<%= form_tag transactions_sales_path, :method => :get do %> <%= form_tag transactions_sales_path, :method => :get do %>
@@ -32,12 +32,24 @@
<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"> <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
<label></label> <label></label>
<input type="submit" value="Search" class='btn btn-primary btn-md'> <br><input type="submit" value="Search" class='btn btn-primary btn-md'>
</div> </div>
</div> </div>
<% end %> <% end %>
</td> </td>
</tr> </tr>
</tbody>
</table>
</div>
<div class="card">
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr> <tr>
<th>Sale Id </th> <th>Sale Id </th>
<th>Receipt no </th> <th>Receipt no </th>
@@ -72,6 +84,7 @@
<%= paginate @sales %> <%= paginate @sales %>
<% end %> <% end %>
</div> </div>
</div>
</div> </div>
</div> </div>