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

merge with aung

Browse Source
This commit is contained in:
Yan
2017-11-21 16:47:07 +06:30
parent ad66a6570b 21bd0f9575
commit 7252e39515
10 changed files with 90 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -465,7 +465,7 @@ $(function() {
// click select option icon for add
$(document).on('click', '.attribute_btn', function(event){
$('.change_qty').val(1);
// $('.change_qty').val(1);
value = $(this).data('value');
type = $(this).data('type');
instances = $(this).data('instances');
@@ -505,6 +505,8 @@ $(function() {
// click select option icon for add
$(document).on('click', '.option_btn', function(event){
active =$(this).hasClass('selected-option');
console.log(active);
value = $(this).data('value');
type = $(this).data('type');
group = $(this).data('group');
@@ -514,7 +516,12 @@ $(function() {
$('.'+type).removeClass("selected-option");
}
});
$(this).addClass('selected-option');
if (active) {
$(this).revoveClass('selected-option');
}else{
$(this).addClass('selected-option');
}
if(group == "set_menu"){
code = $(this).data('code');
@@ -858,7 +865,7 @@ $(function() {
id = $(this).attr('id');
value = $(this).val();
$('#count').attr('value',value);
if (id=="count") {
price = $("#unit_price").text();
$("#total_price").text(value*price);

1
app/controllers/origami/surveys_controller.rb
View File

@@ -30,6 +30,7 @@ class Origami::SurveysController < BaseOrigamiController
end
# end
end
private
# Never trust parameters from the scary internet, only allow the white list through.

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

@@ -5,13 +5,13 @@
<div class="form-group">
<label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
<label><%= t("views.right_panel.detail.mr") %></label>
<label class="font-13"><%= t("views.right_panel.detail.mr") %></label>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
<label><%= t("views.right_panel.detail.miss") %></label>
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.miss") %></label>
<%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
<label><%= t("views.right_panel.detail.mrs") %></label>
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.mrs") %></label>
<%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
<label><%= t("views.right_panel.detail.mdm") %></label>
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.mdm") %></label>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
</div>

10
app/views/oqs/home/index.html.erb
View File

@@ -167,13 +167,9 @@
<!-- Column Three -->
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- OQS Buttons -->
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
<i class="material-icons m-t--10">reply</i>
Back
</button>
<button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</button>
<button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
<!-- <a href="<%= dashboard_path %>" class="btn bg-blue btn-block btn-lg waves-effect" role="button" aria-haspopup="true"> Back </a> -->
<a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
<button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
<button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
<!-- <button type="button" class="" id="print_order_summary">Print <br/>Order<br/>Summary</button> -->
</div>
</div>

16
app/views/origami/credit_payments/index.html.erb
View File

@@ -95,16 +95,16 @@
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom">
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
<div class="row bottom p-l-20">
<div class="cashier_number col-md-5 long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number col-md-5 long left" data-value="3000" data-type="add">3000</div>
</div>
<div class="row bottom">
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
<div class="row bottom p-l-20">
<div class="cashier_number col-md-5 long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number col-md-5 long left" data-value="10000" data-type="add">10000</div>
</div>
<div class="row bottom">
<div class="pay purple left" id="credit_pay">Pay</div>
<div class="row bottom p-l-20">
<div class="pay purple left col-md-10" id="credit_pay">Pay</div>
</div>
</div>
</div>

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

@@ -194,10 +194,10 @@
</div>
</div>
<div class="col-md-3">
<div class="col-md-3 m-l--10">
<div class="form-group">
<button id="net" class="btn bg-info fluid action-btn">Nett</button>
<button id="percentage" class="btn bg-primary fluid action-btn">Percentage</button>
<button id="percentage" class="btn bg-primary fluid action-btn" style="font-size: 12.4px">Percentage</button>
<button id="remove-item" class="btn bg-default fluid action-btn">Clear Discount</button>
</div>
</div>

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

@@ -361,7 +361,7 @@
<button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
<button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
<% if @dining.status != "available" %>
<% if @status_order == 'order' %>
<% if @status_order == 'order' && @status_sale != 'sale' %>
<button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
<!-- <button type="button" class="btn btn-block bg-blue waves-effect" disabled>Edit</button> -->
<!-- <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" disabled>Discount</button> -->
@@ -379,8 +379,6 @@
<button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
<button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
<button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
<!-- <button type="button" class="btn btn-block bg-blue waves-effect" id='move' disabled="">Move</button> -->
<!-- <button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect" disabled> Req.Bill</button> -->
<button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
<button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
<button type="button" id="void" class="btn btn-block bg-blue waves-effect"> Void</button>

87
app/views/origami/surveys/_form.html.erb
View File

@@ -5,34 +5,35 @@
<%= f.error_notification %>
<div class="form-inputs p-l-10">
<%= f.input :child%>
<%= f.input :adult %>
<%= f.input :male %>
<%= f.input :female %>
<%= f.input :local %>
<%= f.input :child , input_html: { class: 'col-md-8' }%>
<%= f.input :adult , input_html: { class: 'col-md-8' }%>
<%= f.input :male , input_html: { class: 'col-md-8' }%>
<%= f.input :female , input_html: { class: 'col-md-8' }%>
<%= f.input :total_customer, input_html: { class: 'col-md-8'} %>
<%= f.input :local , input_html: { class: 'col-md-8' }%>
<div class="row clearfix">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
<div class="form-group">
<label>Foreigner</label>
<select class="form-control col-md-12 selectpicker show-tick" name="survey[foreigner][][]" style="height: " >
<% Lookup.where("lookup_type = ?", "country" ).each do |ct| %>
<option value="<%= ct.value %>">
<%= ct.name %>
</option>
<%end %>
</select>
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
<div class="form-group p-l-10 p-r-10">
<label class="p-l-10">Foreigner</label>
<input type="text" class="form-control" name="survey[foreigner][]">
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
<div class="form-group">
<label>Number</label>
<input type="number" name="survey[foreigner][][]" class="form-control">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">
<div class="form-group p-l-10 p-r-10">
<label class="p-l-10">Number</label>
<input type="number" name="survey[foreigner][]" class="form-control">
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">
<br>
<button type="button" class="btn btn-success" id="addForeigner">Add</button>
</div>
</div>
<%= f.input :total_customer %>
<div class="hidden" id="newTemplate" >
</div>
<input type="hidden" name="table_id" value="<%=@dining_facility.id%>">
<%= f.input :dining_name, :as => :hidden, :input_html => { :value => @dining_facility.name } %>
@@ -79,15 +80,45 @@
<script type="text/javascript">
$(document).ready(function(){
// click back button for redirect
$('#back').on('click',function(){
table_type = '<%=@table_type%>';
table_type = '<%=@table_type%>';
table_id = '<%=@dining_facility.id%>';
if(table_type == "Table"){
window.location.href = "/origami/table/" + table_id
}
else {
window.location.href = "/origami/room/" + table_id
}
})
if(table_type == "Table"){
window.location.href = "/origami/table/" + table_id
}
else {
window.location.href = "/origami/room/" + table_id
}
});
//click add button for new row
$('#addForeigner').on('click',function(){
$('#newTemplate').removeClass('hidden');
var text_box = '<div id="newRow" class="row clearfix">'
+'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">'
+'<div class="form-group p-l-10 p-r-10">'
+' <input type="text" class="form-control" name="survey[foreigner][]">'
+'</div>'
+'</div>'
+'<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ">'
+'<div class="form-group p-l-10 p-r-10">'
+'<input type="number" name="survey[foreigner][]" class="form-control">'
+'</div>'
+'</div>'
+'<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1 ">'
+'<button type="button" class="btn btn-danger" id="removeRow">Remove</button>'
+'</div>'
+'</div>';
$('#newTemplate').append(text_box);
});
//click remove buttom
$('#newTemplate').on('click','#removeRow', function(){
$(this).parent().parent().remove()
});
});
</script>

2
app/views/reports/dailysale/index.html.erb
View File

@@ -21,7 +21,7 @@
<div class="row">
<div class="col-md-12 col-lg-12">
<div class="card ">
<div class="table-responsive">
<div class="body table-responsive">
<table class="table table-bordered">
<thead>
<tr>

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

@@ -2,7 +2,7 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">Settings Membership Actions</li>
<li class="breadcrumb-item">Membership Setting</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
</span>