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-16 15:30:36 +06:30
parent cbefe0f7d8 8cecb9a524
commit c85ebcff14
5 changed files with 82 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/stylesheets/application.scss
View File

@@ -405,4 +405,26 @@ tr.discount-item-row:hover {
-moz-opacity: 1; /* mozilla */ -moz-opacity: 1; /* mozilla */
} }
/***********************End Origami CSS ************************/ /***********************End Origami CSS ************************/
/*----- Order Processing Items -----*/
.opi_ul {
display:block;
padding-left:0px;
}
.opi_ul li {
display:list-item;
list-style: none;
margin-top:2px;
}
.opi_selected {
background-color:#BEA2C2 !important;
}
.opi_default {
cursor: pointer;
background-color: #E8ECF9;
line-height: inherit;
padding:5px;
}
/*----- Order Processing Items -----*/

19
app/views/settings/processing_items/_form.html.erb
View File

@@ -18,15 +18,18 @@
<div class="col-lg-3 col-md-3 col-sm-6"> <div class="col-lg-3 col-md-3 col-sm-6">
<div class="card" style="padding-left:5px"> <div class="card" style="padding-left:5px">
<div class="card-title"> <div class="card-title">
<h4><%= category.name %> <div> <h4><%= category.name %></div>
<br/><br/>
<button type="button" data-id="menu_items_category_<%= category.id %>" class="btn btn-primary processingitems_all" aria-label="Left Align"> <div> <button type="button" data-id="menu_items_category_<%= category.id %>" class="btn btn-info waves-effect processingitems_all" aria-label="Left Align">
<i class="fa fa-list" aria-hidden="true"></i> <!-- <i class="fa fa-list" aria-hidden="true"></i> -->
</button> <i class="material-icons">list</i>
<button type="button" data-id="menu_items_category_<%= category.id %>" class="processingitems_clr btn btn-primary" aria-label="Left Align">
<i class="fa fa-minus-circle" aria-hidden="true"></i>
</button> </button>
<button type="button" data-id="menu_items_category_<%= category.id %>" class="processingitems_clr btn btn-info waves-effect" aria-label="Left Align">
<!-- <i class="fa fa-minus-circle" aria-hidden="true"></i> -->
<i class="material-icons">remove_circle</i>
</button></div>
</div> </div>
<ul class="opi_ul" id="menu_items_category_<%= category.id %>"> <ul class="opi_ul" id="menu_items_category_<%= category.id %>">
<% category.menu_items.each do |item| %> <% category.menu_items.each do |item| %>
@@ -70,5 +73,3 @@
</div> </div>
</div> </div>

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

@@ -1,23 +1,23 @@
<div class="row">
<div class="col-lg-12"> <div class="page-header">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="active"> <li class="breadcrumb-item active">Order</li>
<a href="<%= transactions_orders_path %>">Order</a> <span class="float-right">
</li> <%= link_to 'Back', dashboard_path %>
</span>
</ol> </ol>
</div>
</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 ">
<%= form_tag transactions_orders_path, :method => :get do %> <%= form_tag transactions_orders_path, :method => :get do %>
<div class="form-group col-md-3"> <div class="row clearfix">
<label>Search Keyword</label> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<label class="form-control-label">Search Keyword</label>
<input type="text" name="filter" placeholder="Order ID" class="form-control input-md"> <input type="text" name="filter" placeholder="Order ID" class="form-control input-md">
</div> </div>
<div class="form-group col-md-2"> <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<label>Items Count</label> <label>Items Count</label>
<div id="slider"> <div id="slider">
<input class="bar" name="count" min="0" max="20" type="range" id="rangeinput" onchange="rangevalue.value=value"/> <input class="bar" name="count" min="0" max="20" type="range" id="rangeinput" onchange="rangevalue.value=value"/>
@@ -25,20 +25,21 @@
<output id="rangevalue">0</output> <output id="rangevalue">0</output>
</div> </div>
</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="form-control-label">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="form-control-label">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="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'> <input type="submit" value="Search" class='btn btn-primary btn-md'>
</div> </div>
</div>
<% end %> <% end %>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
@@ -80,7 +81,7 @@
</div> </div>
</div> </div>
<style type="text/css"> <!-- <style type="text/css">
#slider { #slider {
@@ -207,5 +208,5 @@ input[type="range"]:focus{
</style> </style>
-->

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

@@ -1,20 +1,12 @@
<div class="row"> <div class="page-header">
<div class="col-lg-12"> <ol class="breadcrumb">
<ol class="breadcrumb"> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li><a href="<%= crm_root_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= transactions_orders_path %>">Order</a></li>
<li class="active"> <li class="breadcrumb-item active">Details</li>
<a href="<%= transactions_orders_path %>">Order</a> <span class="float-right">
</li> <%= link_to 'Back', transactions_orders_path %>
<li class="active"> </span>
<a href="<%= transactions_orders_path %>"><%= @order.order_id %></a> </ol>
</li>
<span style="float: right">
<a href="<%= transactions_orders_path%>" class="btn btn-primary btn-sm">
<i class="fa fa-arrow-left fa-xs"></i> Back
</a>
</span>
</ol>
</div>
</div> </div>
<hr> <hr>

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

@@ -1,15 +1,12 @@
<div class="row"> <div class="page-header">
<div class="col-lg-12"> <ol class="breadcrumb">
<ol class="breadcrumb"> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li><a href="<%= crm_root_path %>">Home</a></li> <li class="breadcrumb-item active">Sale</li>
<li class="active"> <span class="float-right">
<a href="<%= transactions_sales_path %>">Sale</a> <%= link_to 'Back', dashboard_path %>
</li> </span>
</ol>
</ol>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="main-box-body clearfix"> <div class="main-box-body clearfix">
@@ -19,23 +16,25 @@
<tr> <tr>
<td colspan="8"> <td colspan="8">
<%= form_tag transactions_sales_path, :method => :get do %> <%= form_tag transactions_sales_path, :method => :get do %>
<div class="form-group col-md-4"> <div class="row clearfix">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
<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-3"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<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-3"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<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></label> <label></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>
</div>
<% end %> <% end %>
</td> </td>
</tr> </tr>