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

merge with origin

Browse Source
This commit is contained in:
Yan
2017-10-12 10:23:51 +06:30
parent de1469bd5e 9365e64066
commit 59b47518a1
16 changed files with 342 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/BSBMaterial/pages/index.js
View File

@@ -17,7 +17,7 @@
var realtime = 'on'; var realtime = 'on';
function initRealTimeChart() { function initRealTimeChart() {
//Real time ========================================================================================== //Real time ==========================================================================================
var plot = $.plot('#real_time_chart', [getRandomData()], { /*var plot = $.plot('#real_time_chart', [getRandomData()], {
series: { series: {
shadowSize: 0, shadowSize: 0,
color: 'rgb(0, 188, 212)' color: 'rgb(0, 188, 212)'
@@ -57,7 +57,7 @@ function initRealTimeChart() {
$('#realtime').on('change', function () { $('#realtime').on('change', function () {
realtime = this.checked ? 'on' : 'off'; realtime = this.checked ? 'on' : 'off';
updateRealTime(); updateRealTime();
}); });*/
//==================================================================================================== //====================================================================================================
} }
@@ -69,7 +69,7 @@ function initSparkline() {
} }
function initDonutChart() { function initDonutChart() {
Morris.Donut({ /*Morris.Donut({
element: 'donut_chart', element: 'donut_chart',
data: [{ data: [{
label: 'Chrome', label: 'Chrome',
@@ -92,7 +92,7 @@ function initDonutChart() {
formatter: function (y) { formatter: function (y) {
return y + '%' return y + '%'
} }
}); });*/
} }
var data = [], totalPoints = 110; var data = [], totalPoints = 110;

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

@@ -31,16 +31,55 @@
//= require BSBMaterial/admin.js //= require BSBMaterial/admin.js
//= require BSBMaterial/pages/index.js //= require BSBMaterial/pages/index.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require BSBMaterial/pages/forms/basic-form-elements
/*$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {
$('.datepicker').datepicker({ // $(document).ready(function(){
format : 'dd-mm-yyyy', //Datetimepicker plugin
autoclose: true $('.datetimepicker').bootstrapMaterialDatePicker({
format: 'DD-MM YYYY - HH:mm',
clearButton: true,
weekStart: 1
});
$('.datepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY',
clearButton: true,
weekStart: 1,
time: false
});
$('.timepicker').bootstrapMaterialDatePicker({
format: 'HH:mm',
clearButton: true,
date: false
});
/*
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer');*/
});
$(function(){
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
$('#custom-slimscroll').slimScroll({
height: height,
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0'
}); });
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer'); $('#order-detail-slimscroll').slimScroll({
});*/ height: height-180,
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0'
});
});
$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
$(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});

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

@@ -2,6 +2,7 @@
@import "bootstrap/css/bootstrap-material-design.min"; @import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves"; @import "node-waves/waves";
@import "animate-css/animate"; @import "animate-css/animate";
@import "multi-select/css/multi-select";
@import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker"; @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
@import "bootstrap-select/css/bootstrap-select"; @import "bootstrap-select/css/bootstrap-select";
@import "morrisjs/morris"; @import "morrisjs/morris";
@@ -71,7 +72,7 @@ section.content {
} }
.nav-tabs li a.active { .nav-tabs li a.active {
color: #222 !important; color: #000 !important;
} }
.info-box { .info-box {
@@ -81,6 +82,15 @@ section.content {
.card { .card {
margin-bottom: 20px; margin-bottom: 20px;
} }
.card .card-header {
padding: 0.5rem;
}
.card .card-title{
margin-bottom:0.5rem;
}
.card .card-block {
padding: 0.5rem 1rem 1rem;
}
.checkbox label, label.checkbox-inline { .checkbox label, label.checkbox-inline {
padding-left: 0; padding-left: 0;
@@ -124,7 +134,7 @@ select.form-control {
} }
/* End Reset */ /* End Reset */
/*
.dining { .dining {
min-height:470px; min-height:470px;
max-height:570px; max-height:570px;
@@ -136,7 +146,7 @@ select.form-control {
max-height:500px; max-height:500px;
overflow:auto overflow:auto
} }
*/
.others-payment{ .others-payment{
line-height:100px; line-height:100px;
text-align:center; text-align:center;

7
app/views/crm/customers/_new_form.html.erb
View File

@@ -89,7 +89,7 @@
<div class="form-group"> <div class="form-group">
<label>Select Customer Type</label> <label>Select Customer Type</label>
<select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: " > <select class="form-control col-md-12 selectpicker show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
<% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %> <% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
<option value="<%= ct.value %>"> <option value="<%= ct.value %>">
<%= ct.name %></option> <%= ct.name %></option>
@@ -121,13 +121,14 @@
<div class="form-group"> <div class="form-group">
<label>Select Member Group</label> <label>Select Member Group</label>
<select class="form-control col-md-12" name="member_group_id" style="height: " > <select class="form-control col-md-12 selectpicker show-tick" name="member_group_id" style="height: " >
<option value="">Select Membership Group</option> <option value="">Select Membership Group</option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %> <% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
<option value="<%= member.value %>"> <option value="<%= member.value %>">
<%= member.name %></option> <%= member.name %></option>
<%end %> <%end %>
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">

8
app/views/crm/customers/index.html.erb
View File

@@ -36,10 +36,10 @@
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12"> <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
<div class="form-group"> <div class="form-group">
<div class="form-line"> <!-- <div class="form-line"> -->
<input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control"> <input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control">
<input type="hidden" name="type" id="type" value=""> <input type="hidden" name="type" id="type" value="">
</div> <!-- </div> -->
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
@@ -99,7 +99,8 @@
</div> </div>
<!-- </div> --> <!-- </div> -->
</div> </div>
<div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> <div class="col-lg-4 col-md-4 col-sm-4">
<div id="custom-slimscroll">
<%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %> <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
@@ -108,6 +109,7 @@
Back Back
</a> </a>
</div> </div>
</div>
<!-- <div class="col-lg-1 col-md-1 col-sm-1 "> <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
<br> <br>
<a href="<%= dashboard_path%>" class="btn btn-primary"> <a href="<%= dashboard_path%>" class="btn btn-primary">

17
app/views/crm/customers/show.html.erb
View File

@@ -1,17 +1,18 @@
<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">
<!-- Column One --> <!-- Column One -->
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs tab-col-purple" role="tablist">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#customer" role="tab">Customer Details</a> <li role="presentation" class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#customer" aria-expanded="true">Customer Details</a>
</li> </li>
<li class="nav-item"> <li class="nav-item" role="presentation">
<a class="nav-link " data-toggle="tab" href="#order" role="tab">Order Details</a> <a class="nav-link " data-toggle="tab" href="#order" aria-expanded="true">Order Details</a>
</li> </li>
<li class="nav-item"> <li class="nav-item" role="presentation">
<a class="nav-link" data-toggle="tab" href="#sale" role="tab">Sale Details</a> <a class="nav-link" data-toggle="tab" href="#sale" aria-expanded="true">Sale Details</a>
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->

263
app/views/origami/customers/index.html.erb
View File

@@ -37,10 +37,10 @@
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12"> <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
<div class="form-group"> <div class="form-group">
<div class="form-line"> <!-- <div class="form-line"> -->
<input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9"> <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
<input type="hidden" name="type" id="type" value=""> <input type="hidden" name="type" id="type" value="">
</div> <!-- </div> -->
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
@@ -101,138 +101,141 @@
</div> </div>
<div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> <!-- <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> -->
<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> <div class="col-lg-4 col-md-4 col-sm-4" >
<div id="custom-slimscroll">
<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
<span class="patch_method"></span> <span class="patch_method"></span>
<input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" /> <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
<input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" /> <input type="hidden" id="table_id" name="table_id" value="<%= @dining_facility.id %>" />
<input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" /> <input type="hidden" id="type" name="type" value="<%= @dining_facility.type %>" />
<%= f.error_notification %> <%= f.error_notification %>
<%= f.hidden_field :id, :class => "form-control col-md-6 " %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
<div class="form-group"> <div class="form-group">
<label>Salutation :</label><br> <label>Salutation :</label><br>
<label>Mr</label> <label>Mr</label>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr", :style=>"width: 30px"%>
<label>Miss</label> <label>Miss</label>
<%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs", :style=>"width: 30px"%>
<label>Mrs</label> <label>Mrs</label>
<%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss", :style=>"width: 30px"%>
<label>Mdm</label> <label>Mdm</label>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
<% flash.each do |name, msg| %> <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<% str="[\"#{msg['name']}\"]" <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
str.gsub!('["', '')
str.gsub!('"]', '') %> <% flash.each do |name, msg| %>
<span class="help-block"><%= str %></span> <% str="[\"#{msg['name']}\"]"
<% end -%> str.gsub!('["', '')
</div> str.gsub!('"]', '') %>
<span class="help-block"><%= str %></span>
<div class="form-group"> <% end -%>
<label>Gender :</label><br>
<label>Male</label>
<%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
<label>Female</label>
<%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
</div>
<div class="form-group">
<%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %>
</div>
<div class="form-group">
<%= f.input :company, :class => "form-control col-md-6 company"%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['company']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block"><%= str %></span>
<% end -%>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block"><%= str %></span>
<% end -%>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block"><%= str %></span>
<% end -%>
</div>
<div class="form-group">
<%= f.input :address, :class => "form-control col-md-6 address" %>
</div>
<div class="form-group">
<label>Sr.No</label>
<input type="text" name="" value="<%=@count_customer%>" class="form-control" readonly="true">
</div>
<div class="form-group">
<label>Date Of Birth</label>
<%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
</div>
<div class="form-group">
<label>Select Customer Type</label>
<select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" >
<% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
<option value="<%= ct.value %>">
<%= ct.name %></option>
<%end %>
</select>
</div>
<div class="form-group">
<%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['name']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-10px"><%= str %></span>
<% end -%>
</div>
<div class="form-group">
<label>Paypar Account No:</label>
<div class="input-group">
<input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
<div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label>Select Member Group</label> <label>Gender :</label><br>
<select class="form-control col-md-12" name="member_group_id"> <label>Male</label>
<option value="">Select Membership Group</option> <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %> <label>Female</label>
<option value="<%= member.value %>"> <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
<%= member.name %></option> </div>
<%end %>
</select> <div class="form-group">
</div> <%= f.input :nrc_no, :label => "NRC No",:class => "form-control nrc_no" %>
</div>
<div class="form-group">
<%= f.input :company, :class => "form-control col-md-6 company"%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['company']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block"><%= str %></span>
<% end -%>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" ,:required => true%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block"><%= str %></span>
<% end -%>
</div>
<div class="form-group"> <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.button :submit, "Submit",:class => 'btn bg-blue waves-effect', :id => 'submit_customer' %> <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
<!-- <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> --> <% flash.each do |name, msg| %>
<% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block"><%= str %></span>
<% end -%>
</div>
<div class="form-group">
<%= f.input :address, :class => "form-control col-md-6 address" %>
</div>
<div class="form-group">
<label>Sr.No</label>
<input type="text" name="" value="<%=@count_customer%>" class="form-control" readonly="true">
</div>
<div class="form-group">
<label>Date Of Birth</label>
<%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
</div>
<div class="form-group">
<label>Select Customer Type</label>
<select class="form-control col-md-12" id="customer_type" name="customer[customer_type]" style="height: 40px" >
<% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
<option value="<%= ct.value %>">
<%= ct.name %></option>
<%end %>
</select>
</div>
<div class="form-group">
<%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
</div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['name']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-10px"><%= str %></span>
<% end -%>
</div>
<div class="form-group">
<label>Paypar Account No:</label>
<div class="input-group">
<input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly />
<div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
</div>
</div>
<div class="form-group">
<label>Select Member Group</label>
<select class="form-control col-md-12" name="member_group_id">
<option value="">Select Membership Group</option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
<option value="<%= member.value %>">
<%= member.name %></option>
<%end %>
</select>
</div>
<div class="form-group">
<%= f.button :submit, "Submit",:class => 'btn bg-blue waves-effect', :id => 'submit_customer' %>
<!-- <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> -->
</div>
</div> </div>
<%end%> <%end%>
</div> </div>

6
app/views/origami/discounts/index.html.erb
View File

@@ -18,13 +18,14 @@
<p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> <p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
</div> </div>
</div> </div>
<div id="custom-slimscroll">
<div class="card-text dining"> <div class="card-text dining">
<table class="table table-default" id="order-items-table"> <table class="table table-default" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th class="item-name">Items</th> <th class="item-name">Items</th>
<th class="item-attr">QTY</td> <th class="item-attr">QTY</th>
<th class="item-attr">Price</td> <th class="item-attr">Price</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -53,6 +54,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

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

@@ -20,9 +20,9 @@
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div class="tab-content" > <div class="tab-content" id="custom-slimscroll">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane dining" id="Completed" role="tabpanel"> <div class="tab-pane dining" id="Completed " role="tabpanel">
<div class="card-columns"> <div class="card-columns">
<% @complete.each do |sale| %> <% @complete.each do |sale| %>
<div class="card sales red text-white" data-id = "<%= sale.sale_id %>"> <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">

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

@@ -21,7 +21,8 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div class="tab-content"> <div id="custom-slimscroll">
<div class="tab-content" >
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane dining" id="completed" role="tabpanel"> <div class="tab-pane dining" id="completed" role="tabpanel">
@@ -38,7 +39,7 @@
</div> </div>
<!--- Panel 1 - Table Orders --> <!--- Panel 1 - Table Orders -->
<div class="tab-pane dining active" id="tables" role="tabpanel"> <div class="tab-pane dining active " id="tables" role="tabpanel">
<div class="card-columns"> <div class="card-columns">
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
@@ -112,6 +113,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>
<!-- Column One --> <!-- Column One -->
@@ -131,32 +133,33 @@
<div class="card-title"> <div class="card-title">
<div class="row"> <div class="row">
<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' %>
<%= @sale_array[0].receipt_no rescue '' %> <%= @sale_array[0].receipt_no rescue '' %>
<% end %> <% end %>
</span></p> </span>
<br>
</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"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span> Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
</p> <br>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<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>
<p>Customer : <%= @sale_array[0].customer.name rescue '' %></p> Customer : <%= @sale_array[0].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>
</div> </div>
</div> </div>
<div id="order-detail-slimscroll">
<div class="card-text order-info"> <div class="card-text order-info" >
<table class="table table-striped" id="order-items-table"> <table class="table table-striped" id="order-items-table">
<thead> <thead>
<tr> <tr>
@@ -221,6 +224,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

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

@@ -19,8 +19,8 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="custom-slimscroll">
<div class="tab-content"> <div class="tab-content">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane " id="completed" role="tabpanel" style="max-height:600px; overflow:auto"> <div class="tab-pane " id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
@@ -114,6 +114,7 @@
</div> </div>
</div> </div>
</div>
</div> </div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>

6
app/views/origami/other_charges/index.html.erb
View File

@@ -18,13 +18,14 @@
<p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> <p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
</div> </div>
</div> </div>
<div id="order-detail-slimscroll">
<div class="card-text dining"> <div class="card-text dining">
<table class="table table-default" id="order-items-table"> <table class="table table-default" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th class="item-name">Items</th> <th class="item-name">Items</th>
<th class="item-attr">QTY</td> <th class="item-attr">QTY</th>
<th class="item-attr">Price</td> <th class="item-attr">Price</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -53,6 +54,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

5
app/views/origami/payments/show.html.erb
View File

@@ -39,7 +39,9 @@
<!-- </thead> --> <!-- </thead> -->
</table> </table>
</div> </div>
<div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll"> <div id="order-detail-slimscroll">
<!-- <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll"> -->
<div id="table-details" class="card-text" >
<table class="table" id="append-table"> <table class="table" id="append-table">
<tbody> <tbody>
<% sub_total = 0 <% sub_total = 0
@@ -66,6 +68,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" style="margin-bottom:0px"> <table class="table" style="margin-bottom:0px">
<tfooter> <tfooter>

5
app/views/origami/product_commissions/load_commissioners.html.erb
View File

@@ -46,7 +46,9 @@
</div> </div>
</div> </div>
<div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll"> <div id="order-detail-slimscroll">
<!-- <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll"> -->
<div class="card-text">
<table class="table " id="order-items-table"> <table class="table " id="order-items-table">
<thead> <thead>
<tr> <tr>
@@ -93,6 +95,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

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

@@ -19,100 +19,100 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="custom-slimscroll">
<div class="tab-content" > <div class="tab-content" >
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane dining" id="completed" role="tabpanel"> <div class="tab-pane dining" id="completed" role="tabpanel">
<div class="card-columns"> <div class="card-columns">
<% @complete.each do |sale| %> <% @complete.each do |sale| %>
<div class="card sales red text-white" data-id = "<%= sale.sale_id %>"> <div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block"> <div class="card-block">
<%= sale.receipt_no %><span class="pull-right font-12"><%= sale.sale_status %></span> <%= sale.receipt_no %><span class="pull-right font-12"><%= sale.sale_status %></span>
</div>
</div>
<% end %>
</div>
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane dining" id="tables" role="tabpanel">
<div class="card-columns">
<% @tables.each do |table| %>
<% if table.status == 'occupied' %>
<% if table.get_booking.nil? %>
<div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
</div>
</div>
<% else %>
<div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
</div>
</div>
<% end %>
<% else %>
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %> hide">
</div>
</div>
<% end %>
<% end %>
</div>
</div>
<!--- Panel 2 - Room Orders -->
<div class="tab-pane dining active" id="rooms" role="tabpanel">
<div class="card-columns">
<% @rooms.each do |room| %>
<% if room.status == 'occupied' %>
<% if room.get_booking.nil? %>
<div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
<div style="font-size:12px;"></div>
</div>
</div>
<% else %>
<div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
</div>
</div>
<% end %>
<% else %>
<div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %> hide">
</div>
</div>
<% end %>
<% end %>
</div>
</div>
<!--- Panel 3 - Orders -->
<div class="tab-pane dining" id="orders" role="tabpanel">
<div class="card-columns">
<% @orders.each do |order| %>
<div class="card orders red text-white" data-id = "<%= order.order_id %>">
<div class="card-block">
<%= order.order_id %>
</div>
</div> </div>
</div>
<% end %>
</div>
</div>
<!--- Panel 1 - Table Orders -->
<div class="tab-pane dining" id="tables" role="tabpanel">
<div class="card-columns">
<% @tables.each do |table| %>
<% if table.status == 'occupied' %>
<% if table.get_booking.nil? %>
<div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %>"> billed</span>
</div>
</div>
<% else %>
<div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %>"> new</span>
</div>
</div>
<% end %>
<% else %>
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<span class="pull-right font-12 new_text_<%= table.id %> hide">
</div>
</div>
<% end %>
<% end %>
</div>
</div>
<!--- Panel 2 - Room Orders -->
<div class="tab-pane dining active" id="rooms" role="tabpanel">
<div class="card-columns">
<% @rooms.each do |room| %>
<% if room.status == 'occupied' %>
<% if room.get_booking.nil? %>
<div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %>"> billed</span>
<div style="font-size:12px;"></div>
</div>
</div>
<% else %>
<div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %>"> new</span>
</div>
</div>
<% end %> <% end %>
<% else %>
<div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<span class="pull-right font-12 new_text_<%= room.id %> hide">
</div>
</div> </div>
<% end %>
<% end %>
</div> </div>
</div> </div>
<!--- Panel 3 - Orders -->
<div class="tab-pane dining" id="orders" role="tabpanel">
<div class="card-columns">
<% @orders.each do |order| %>
<div class="card orders red text-white" data-id = "<%= order.order_id %>">
<div class="card-block">
<%= order.order_id %>
</div>
</div>
<% end %>
</div>
</div>
</div> </div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>

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

@@ -19,8 +19,8 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="custom-slimscroll">
<div class="tab-content"> <div class="tab-content">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane active" id="completed" role="tabpanel" style="max-height:600px; overflow:auto"> <div class="tab-pane active" id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
@@ -99,6 +99,7 @@
</div> </div>
</div> </div>
</div>
</div> </div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>