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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Moe Su
2017-06-13 10:46:06 +06:30
parent 59d53816bd f8df5147a4
commit 21936fe3b0
18 changed files with 198 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -95,6 +95,6 @@ gem 'httparty', '~> 0.15.5'
# gem 'momentjs-rails', '>= 2.9.0' # gem 'momentjs-rails', '>= 2.9.0'
# gem 'bootstrap-datepicker-rails' # gem 'bootstrap-datepicker-rails'
# gem 'momentjs-rails', '>= 2.9.0' # # gem 'momentjs-rails', '>= 2.9.0'
# gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47' # gem 'bootstrap3-datetimepicker-rails'z
gem 'bootstrap-datepicker-rails' gem 'bootstrap-datepicker-rails'

14
Gemfile.lock
View File

@@ -80,8 +80,8 @@ GEM
httparty (0.15.5) httparty (0.15.5)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (0.8.4) i18n (0.8.4)
jbuilder (2.6.4) jbuilder (2.7.0)
activesupport (>= 3.0.0) activesupport (>= 4.2.0)
multi_json (>= 1.2) multi_json (>= 1.2)
jquery-rails (4.3.1) jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
@@ -95,20 +95,20 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.5) mail (2.6.6)
mime-types (>= 1.16, < 4) mime-types (>= 1.16, < 4)
method_source (0.8.2) method_source (0.8.2)
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mini_portile2 (2.1.0) mini_portile2 (2.2.0)
minitest (5.10.2) minitest (5.10.2)
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.6.0) multi_xml (0.6.0)
mysql2 (0.4.6) mysql2 (0.4.6)
nio4r (2.1.0) nio4r (2.1.0)
nokogiri (1.7.2) nokogiri (1.8.0)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.2.0)
pdf-core (0.7.0) pdf-core (0.7.0)
pg (0.20.0) pg (0.20.0)
prawn (2.2.2) prawn (2.2.2)
@@ -180,7 +180,7 @@ GEM
activesupport (>= 3.2.1) activesupport (>= 3.2.1)
shoulda-matchers (3.1.1) shoulda-matchers (3.1.1)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
sidekiq (5.0.0) sidekiq (5.0.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0) connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0) rack-protection (>= 1.5.0)

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

@@ -17,11 +17,7 @@
//= require turbolinks //= require turbolinks
//= require cable //= require cable
//= require settings/processing_items //= require settings/processing_items
//= require bootstrap-datepicker/core //= require bootstrap-datepicker
//= require bootstrap-datepicker/locales/bootstrap-datepicker.es
$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
$(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
$('.dropdown-toggle').dropdown();
});

4
app/assets/javascripts/report.js Normal file
View File

@@ -0,0 +1,4 @@
$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
$(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
$('.dropdown-toggle').dropdown();
});

0
app/assets/stylesheets/application.css Normal file
View File

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

@@ -2,7 +2,7 @@
@import "bootstrap"; @import "bootstrap";
@import "font-awesome"; @import "font-awesome";
@import "theme"; @import "theme";
@import 'bootstrap-datepicker'; @import "bootstrap-datepicker";
/* Show it is fixed to the top */ /* Show it is fixed to the top */
// body { // body {

69
app/controllers/base_report_controller.rb
View File

@@ -1,8 +1,77 @@
class BaseReportController < ActionController::Base class BaseReportController < ActionController::Base
include LoginVerification include LoginVerification
layout "application"
#before_action :check_installation #before_action :check_installation
protect_from_forgery with: :exception protect_from_forgery with: :exception
PERIOD = {
"today" => 0,
"yesterday" => 1,
"this_week" => 2,
"last_week" => 3,
"last_7" => 4,
"this_month" => 5,
"last_month" => 6,
"last_30" => 7,
"this_year" => 8,
"last_year" => 9
}
def get_date_range_from_params
period_type = params[:period_type]
period = params[:period]
from = params[:from]
to = params[:to]
day_ref = Time.now
if period_type.to_i == 1
if params[:from] && params[:to]
if params[:from] != "" && params[:to] !=""
from = DateTime.strptime(params[:from], "%m/%d/%Y")
to = DateTime.strptime(params[:to], "%m/%d/%Y")
else
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
end
end
else
case period.to_i
when PERIOD["today"]
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
when PERIOD["yesterday"]
from = (day_ref - 1.day).beginning_of_day.utc
to = (day_ref - 1.day).end_of_day.utc
when PERIOD["this_week"]
from = Time.now.beginning_of_week.utc
to = Time.now.utc
when PERIOD["last_week"]
from = (day_ref - 7.day).beginning_of_week.utc
to = (day_ref - 7.day).end_of_week.utc
when PERIOD["last_7"]
from = (day_ref - 7.day).utc
to = Time.now.utc
when PERIOD["this_month"]
from = Time.now.beginning_of_month.utc
to = Time.now.utc
when PERIOD["last_month"]
from = (day_ref - 1.month).beginning_of_month.utc
to = (day_ref - 1.month).end_of_month.utc
when PERIOD["last_30"]
from = (day_ref - 30.day).utc
to = Time.now.utc
when PERIOD["this_year"]
from = Time.now.beginning_of_year.utc
to = Time.now.utc
when PERIOD["last_year"]
from = (day_ref - 1.year).beginning_of_year.utc
to = (day_ref - 1.year).end_of_year.utc
end
end
return from, to
end
end end

13
app/controllers/crm/customers_controller.rb
View File

@@ -10,13 +10,13 @@ class Crm::CustomersController < BaseCrmController
@crm_customers = Customer.order("customer_id").page(params[:page]) @crm_customers = Customer.order("customer_id").page(params[:page])
#@products = Product.order("name").page(params[:page]).per(5) #@products = Product.order("name").page(params[:page]).per(5)
else else
@crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) end
end
#@crm_customers = Customer.all #@crm_customers = Customer.all
@crm_customer = Customer.new @crm_customer = Customer.new
if @crm_customer.valid?
@crm_customer.errors.messages
end # puts @crm_customer.valid?
# @membership = Customer.get_member_group # @membership = Customer.get_member_group
# if @membership["status"] == true # if @membership["status"] == true
# @member_group = @membership["data"] # @member_group = @membership["data"]
@@ -57,8 +57,8 @@ class Crm::CustomersController < BaseCrmController
def create def create
@crm_customers = Customer.new(customer_params) @crm_customers = Customer.new(customer_params)
respond_to do |format| respond_to do |format|
puts @crm_customers.errors.to_json
if @crm_customers.save if @crm_customers.save
name = customer_params[:name] name = customer_params[:name]
phone = customer_params[:contact_no] phone = customer_params[:contact_no]
@@ -107,6 +107,7 @@ class Crm::CustomersController < BaseCrmController
if params[:sale_id] if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
else else
format.html { redirect_to crm_customers_path} format.html { redirect_to crm_customers_path}
format.json { render json: @crm_customers.errors, status: :unprocessable_entity } format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
end end

25
app/controllers/origami/payments_controller.rb
View File

@@ -20,6 +20,31 @@ class Origami::PaymentsController < BaseOrigamiController
@cash = 0.0 @cash = 0.0
@other = 0.0 @other = 0.0
@sale_data = Sale.find_by_sale_id(sale_id) @sale_data = Sale.find_by_sale_id(sale_id)
#get customer amount
@customer = Customer.find(@sale_data.customer_id)
membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("get_all_member_account")
merchant_uid = memberaction.merchant_account_id.to_s
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid}.to_json,
:headers => {
'Content-Type' => 'application/json',
'Accept' => 'application/json'
}
)
@balance = 0.00
response["data"].each do |res|
if res["accountable_type"] == "RebateAccount"
@balance = res["balance"]
end
end
#end customer amount
@sale_data.sale_payments.each do |spay| @sale_data.sale_payments.each do |spay|
if spay.payment_method == "cash" if spay.payment_method == "cash"
@cash = spay.payment_amount @cash = spay.payment_amount

21
app/controllers/reports/daily_sale_controller.rb Normal file
View File

@@ -0,0 +1,21 @@
class Reports::DailySaleController < BaseReportController
PERIOD = {
"today" => 0,
"yesterday" => 1,
"this_week" => 2,
"last_week" => 3,
"last_7" => 4,
"this_month" => 5,
"last_month" => 6,
"last_30" => 7,
"this_year" => 8,
"last_year" => 9
}
def index
from, to = get_date_range_from_params
@sale_data = Sale.get_receipt_no_list(from,to)
@sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50)
end
end

72
app/controllers/reports/receipt_no_controller.rb
View File

@@ -1,17 +1,4 @@
class Reports::ReceiptNoController < ApplicationController class Reports::ReceiptNoController < BaseReportController
PERIOD = {
"today" => 0,
"yesterday" => 1,
"this_week" => 2,
"last_week" => 3,
"last_7" => 4,
"this_month" => 5,
"last_month" => 6,
"last_30" => 7,
"this_year" => 8,
"last_year" => 9
}
def index def index
from, to = get_date_range_from_params from, to = get_date_range_from_params
puts "from..." puts "from..."
@@ -25,61 +12,4 @@ class Reports::ReceiptNoController < ApplicationController
def show def show
end end
private
def get_date_range_from_params
period_type = params[:period_type]
period = params[:period]
from = params[:from]
to = params[:to]
day_ref = Time.now
if period_type.to_i == 1
if params[:from] && params[:to]
if params[:from] != "" && params[:to] !=""
from = DateTime.strptime(params[:from], "%m/%d/%Y")
to = DateTime.strptime(params[:to], "%m/%d/%Y")
else
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
end
end
else
case period.to_i
when PERIOD["today"]
from = day_ref.beginning_of_day.utc
to = day_ref.end_of_day.utc
when PERIOD["yesterday"]
from = (day_ref - 1.day).beginning_of_day.utc
to = (day_ref - 1.day).end_of_day.utc
when PERIOD["this_week"]
from = Time.now.beginning_of_week.utc
to = Time.now.utc
when PERIOD["last_week"]
from = (day_ref - 7.day).beginning_of_week.utc
to = (day_ref - 7.day).end_of_week.utc
when PERIOD["last_7"]
from = (day_ref - 7.day).utc
to = Time.now.utc
when PERIOD["this_month"]
from = Time.now.beginning_of_month.utc
to = Time.now.utc
when PERIOD["last_month"]
from = (day_ref - 1.month).beginning_of_month.utc
to = (day_ref - 1.month).end_of_month.utc
when PERIOD["last_30"]
from = (day_ref - 30.day).utc
to = Time.now.utc
when PERIOD["this_year"]
from = Time.now.beginning_of_year.utc
to = Time.now.utc
when PERIOD["last_year"]
from = (day_ref - 1.year).beginning_of_year.utc
to = (day_ref - 1.year).end_of_year.utc
end
end
return from, to
end
end end

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

@@ -66,25 +66,20 @@
</div> </div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
<span class="patch_method"></span> <span class="patch_method"></span>
<%= 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">
<%= f.input :name, :class => "form-control col-md-6 name" %> <%= f.input :name, :class => "form-control col-md-6 name" %>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :company, :class => "form-control col-md-6 company" %> <%= f.input :company, :class => "form-control col-md-6 company" %>
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -92,11 +87,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Date Of Birth</label> <%= f.input :date_of_birth,:class=>"form-control date_of_birth"%>
<%= f.text_field :date_of_birth,:class => "form-control datepicker date_of_birth "%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Select Member Group</label>
<select class="selectpicker form-control col-md-12" name="member_group_id"> <select class="selectpicker form-control col-md-12" name="member_group_id">
<option>Select Member Group</option> <option>Select Member Group</option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %> <% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
@@ -115,21 +110,8 @@
</div> </div>
</div> </div>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () {
if (jQuery().datepicker) {
$('.datepicker').datepicker({
format : 'dd-mm-yyyy',
autoclose: true
});
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer');
}
});
$(document).on('click',".checkbox_check",function(){ $(document).on('click',".checkbox_check",function(){
if(this.checked){ if(this.checked){
@@ -137,13 +119,13 @@
var sale_id = $("#sale_id").val() || 0; var sale_id = $("#sale_id").val() || 0;
var customer_id = $(this).val(); var customer_id = $(this).val();
if(sale_id != 0){ // if(sale_id != 0){
// var url = "/"+customer_id; // // var url = "/"+customer_id;
update_sale(customer_id,sale_id); // update_sale(customer_id,sale_id);
}else{ // }else{
var url = "customers/"+customer_id; // var url = "customers/"+customer_id;
} // }
$.ajax({ $.ajax({
type: "GET", type: "GET",
@@ -179,43 +161,43 @@
} }
}) })
function update_sale(customer_id,sale_id) { // function update_sale(customer_id,sale_id) {
$.confirm({ // $.confirm({
title: 'Confirm!', // title: 'Confirm!',
content: 'Are You Sure to assign this customer!', // content: 'Are You Sure to assign this customer!',
buttons: { // buttons: {
cancel: function () { // cancel: function () {
}, // },
confirm: { // confirm: {
text: 'Confirm', // text: 'Confirm',
btnClass: 'btn-green', // btnClass: 'btn-green',
keys: ['enter', 'shift'], // keys: ['enter', 'shift'],
action: function(){ // action: function(){
$.ajax({ // $.ajax({
type: "POST", // type: "POST",
url: "update_sale/" , // url: "update_sale/" ,
data: {customer_id:customer_id,sale_id:sale_id}, // data: {customer_id:customer_id,sale_id:sale_id},
dataType: "json", // dataType: "json",
success: function(data) { // success: function(data) {
if(data.status == true) // if(data.status == true)
{ // {
alert('Customer has assigned'); // alert('Customer has assigned');
window.location.href = '/origami' // window.location.href = '/origami'
}else{ // }else{
alert('Record not found!'); // alert('Record not found!');
location.reload(); // location.reload();
} // }
} // }
}); // });
} // }
} // }
} // }
}); // });
} // }
</script> </script>

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

@@ -38,6 +38,7 @@
<th>Company</th> <th>Company</th>
<th>Contact no</th> <th>Contact no</th>
<th>Email</th> <th>Email</th>
<th>Date of Birth</th>
</tr> </tr>
</thead> </thead>
@@ -47,11 +48,11 @@
<td> <td>
<input type="radio" style="width:20px;" value="<%= crm_customer.customer_id %>" name="checkbox" class="checkbox_check" ></td> <input type="radio" style="width:20px;" value="<%= crm_customer.customer_id %>" name="checkbox" class="checkbox_check" ></td>
<td><%= crm_customer.name %></td> <td><%= crm_customer.name %></td>
<td><%= crm_customer.company %></td> <td><%= crm_customer.company rescue '-' %></td>
<td><%= crm_customer.contact_no %></td> <td><%= crm_customer.contact_no %></td>
<td><%= crm_customer.email %></td> <td><%= crm_customer.email %></td>
<td> <td>
<%= link_to 'Destroy', crm_customer_path(crm_customer), method: :delete, data: { confirm: 'Are you sure?' } %> <%= crm_customer.date_of_birth rescue '-' %>
</td> </td>
@@ -84,8 +85,6 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -93,11 +92,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Date Of Birth</label> <%= f.input :date_of_birth,:class=>"form-control date_of_birth"%>
<%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Select Member Group</label>
<select class="selectpicker form-control col-md-12" name="member_group_id"> <select class="selectpicker form-control col-md-12" name="member_group_id">
<option>Select Member Group</option> <option>Select Member Group</option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %> <% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
@@ -107,19 +106,9 @@
</select> </select>
</div> </div>
<!-- <div class="form-group">
<%= f.input :membership_type, :class => "form-control col-md-6 membership_type" %>
</div>
<div class="form-group">
<%= f.input :membership_authentication_code, :class => "form-control col-md-6 membership_authentication_code" %>
</div> -->
<div class="form-group"> <div class="form-group">
<%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
<%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> <!-- <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> -->
</div> </div>
<%end%> <%end%>
</div> </div>
@@ -128,17 +117,6 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () {
if (jQuery().datepicker) {
$('.datepicker').datepicker({
format : 'dd-mm-yyyy',
autoclose: true
});
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer');
}
});
$(document).on('click',".checkbox_check",function(){ $(document).on('click',".checkbox_check",function(){
if(this.checked){ if(this.checked){

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

@@ -316,7 +316,7 @@
sub_total = 0 sub_total = 0
if @selected_item_type == "Sale" if @selected_item_type == "Sale"
@selected_item.sale_items.each do |sale_item| @selected_item.sale_items.each do |sale_item|
sub_total += sale_item.qty*sale_item.unit_price sub_total += (sale_item.qty*sale_item.unit_price)
%> %>
<tr> <tr>
<td class='item-name'><%= sale_item.product_name %></td> <td class='item-name'><%= sale_item.product_name %></td>

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

@@ -14,8 +14,8 @@
<td><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></td> <td><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></td>
</tr> </tr>
<tr> <tr>
<td><strong>Customer :</strong> Default Customer</td> <td><strong>Customer :</strong> <%= @sale_data.customer.name%></td>
<td><strong>Points :</strong> 1234 </td> <td><strong>Points :</strong> <%= @balance %> </td>
</tr> </tr>
</table> </table>
</div> </div>

0
app/views/reports/daily_sale_report.html.erb Normal file
View File

1
app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
View File

@@ -1,5 +1,6 @@
<%= form_tag report_path, :method => :get, :id=>"frm_report" do %> <%= form_tag report_path, :method => :get, :id=>"frm_report" do %>
<div class="row"> <div class="row">
<div class="col-md-12"></div>
<div class="span3"> <div class="span3">
<% if defined? product_account %> <% if defined? product_account %>
<%= select_tag "account", options_from_collection_for_select(@accounts,"id","title", :selected => params[:account])%> <%= select_tag "account", options_from_collection_for_select(@accounts,"id","title", :selected => params[:account])%>

1
app/views/reports/receipt_no/index.html.erb
View File

@@ -8,6 +8,7 @@
</span> </span>
</ul> </ul>
</div> </div>
<div class="card"> <div class="card">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>