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

finished CRM and customer

Browse Source
This commit is contained in:
Aung Myo
2017-06-12 14:23:20 +06:30
parent 0943808ac8
commit e90178cfdc
13 changed files with 121 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/assets/javascripts/origami.js
View File

@@ -27,11 +27,8 @@ $(document).ready(function(){
control_button(order_status); control_button(order_status);
//for customer button //for customer button
if(unique_id.charAt(0) == 'S'){
$("#customer").removeAttr('disabled'); $("#customer").removeAttr('disabled');
}else{
$("#customer").attr('disabled','disabled');
}
var customer_id=$(this).find(".customer-id").text(); var customer_id=$(this).find(".customer-id").text();
show_customer_details(customer_id); show_customer_details(customer_id);
@@ -161,13 +158,20 @@ $(document).ready(function(){
}); });
$('#customer').click(function() { $('#customer').click(function() {
var sale_id=$(".selected-item").find(".orders-id").text(); var sale = $(".selected-item").find(".orders-id").text();
if (sale.substring(0, 3)=="SAL") {
var sale_id = sale
}else{
var sale_id = $(".selected-item").find(".order-cid").text();
}
alert(sale_id);
window.location.href = '/origami/'+ sale_id + "/add_customer" window.location.href = '/origami/'+ sale_id + "/add_customer"
return false; return false;
}); });
function show_customer_details(customer_id){ function show_customer_details(customer_id){
$('.customer_detail').removeClass('hide'); $('.customer_detail').removeClass('hide');
//Start Ajax //Start Ajax
$.ajax({ $.ajax({
@@ -176,8 +180,20 @@ $(document).ready(function(){
data: {}, data: {},
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
$("#customer_name").text(data.name); $("#customer_name").text(data["customer"].name);
$("#customer_name").text(data.name); $.each(data["response_data"]["data"], function (i) {
if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
var balance = data["response_data"]["data"][i]["balance"];
console.log(balance);
if (balance) {
$("#customer_amount").text(balance);
}else{
$("#customer_amount").text('00');
}
}
});
} }
}); });
//End Ajax //End Ajax

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

@@ -14,9 +14,9 @@ class Crm::CustomersController < BaseCrmController
end end
#@crm_customers = Customer.all #@crm_customers = Customer.all
@crm_customer = Customer.new @crm_customer = Customer.new
@crm_customer.valid? if @crm_customer.valid?
@crm_customer.errors.messages
end
# @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"]
@@ -54,17 +54,17 @@ class Crm::CustomersController < BaseCrmController
# POST /crm/customers # POST /crm/customers
# POST /crm/customers.json # POST /crm/customers.json
def create def create
@crm_customers = Customer.new(customer_params) @crm_customers = Customer.new(customer_params)
respond_to do |format| respond_to do |format|
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]
email = customer_params[:email] email = customer_params[:email]
date_of_birth = customer_params[:date_of_birth] date_of_birth = customer_params[:date_of_birth]
membership_id = params[:membership_id] member_group_id = params[:member_group_id]
membership = MembershipSetting.find_by_membership_type("paypar_url") membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("create_membership_customer") memberaction = MembershipAction.find_by_membership_type("create_membership_customer")
@@ -73,7 +73,7 @@ class Crm::CustomersController < BaseCrmController
response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, response = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
date_of_birth: date_of_birth, date_of_birth: date_of_birth,
membership_id: membership_id}.to_json, member_group_id: member_group_id}.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json' 'Accept' => 'application/json'
@@ -85,37 +85,34 @@ class Crm::CustomersController < BaseCrmController
customer = Customer.find(@crm_customers.customer_id) customer = Customer.find(@crm_customers.customer_id)
status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) status = customer.update_attributes(membership_id: response["customer_datas"]["id"])
if params[:sale_id].nil? if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' }
format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' } else
format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'}
end
# format.json { render :index, status: :created, location: @crm_customers } # format.json { render :index, status: :created, location: @crm_customers }
else else
@crm_customers.destroy @crm_customers.destroy
if params[:sale_id].nil? 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, notice: response["message"] } format.html { redirect_to crm_customers_path, notice: response["message"] }
end end
end end
# format.json { render :index, status: :created, location: @crm_customers }
else else
if params[:sale_id].nil? 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
end end
end
end end
end end
@@ -131,6 +128,7 @@ end
email = customer_params[:email] email = customer_params[:email]
date_of_birth = customer_params[:date_of_birth] date_of_birth = customer_params[:date_of_birth]
id = customer_params[:membership_id] id = customer_params[:membership_id]
member_group_id = params[:member_group_id]
membership = MembershipSetting.find_by_membership_type("paypar_url") membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("update_membership_customer") memberaction = MembershipAction.find_by_membership_type("update_membership_customer")
@@ -139,7 +137,7 @@ end
response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, response = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
date_of_birth: date_of_birth, date_of_birth: date_of_birth,
id: id}.to_json, id: id,member_group_id:member_group_id}.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json' 'Accept' => 'application/json'

8
app/controllers/origami/customers_controller.rb
View File

@@ -23,10 +23,10 @@ class Origami::CustomersController < BaseOrigamiController
@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_customer = Customer.new @crm_customer = Customer.new
@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"]
end # end
respond_to do |format| respond_to do |format|
# format.html { render :template => "crm/customers/index" } # format.html { render :template => "crm/customers/index" }
format.html { render action: "index"} format.html { render action: "index"}

31
app/controllers/origami/home_controller.rb
View File

@@ -29,15 +29,21 @@ class Origami::HomeController < BaseOrigamiController
def update_sale_by_customer def update_sale_by_customer
sale = Sale.find(params[:sale_id]) id = params[:sale_id][0,3]
status = sale.update_attributes(customer_id: params[:customer_id]) if(id == "SAL")
sale = Sale.find(params[:sale_id])
if status == true else
sale = Order.find(params[:sale_id])
end
status = sale.update_attributes(customer_id: params[:customer_id])
if status == true
render json: JSON.generate({:status => true}) render json: JSON.generate({:status => true})
else else
render json: JSON.generate({:status => false, :error_message => "Record not found"}) render json: JSON.generate({:status => false, :error_message => "Record not found"})
end end
end end
def get_customer def get_customer
@@ -50,15 +56,20 @@ class Origami::HomeController < BaseOrigamiController
app_token = membership.auth_token.to_s app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.post(url, :body => { membership_id: @customer.membership_id}.to_json, response = HTTParty.get(url, :body => { membership_id: @customer.membership_id}.to_json,
:headers => { :headers => {
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json' 'Accept' => 'application/json'
} }
) )
respond_to do |format|
format.js do
render :json => response.to_json render :json => {
:response_data => response.as_json,
:customer => @customer}
end
end
end end
end end

4
app/models/customer.rb
View File

@@ -14,9 +14,9 @@ class Customer < ApplicationRecord
def self.get_member_group def self.get_member_group
membership = MembershipSetting.find_by_membership_type("paypar_url") membership = MembershipSetting.find_by_membership_type("paypar_url")
memberaction = MembershipAction.find_by_membership_type("get_all_member_group") memberaction = MembershipAction.find_by_membership_type("get_all_member_group")
app_token = membership.auth_token.to_s app_token = membership.auth_token.to_s
url = membership.gateway_url.to_s + memberaction.gateway_url.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s
response = HTTParty.get(url, response = HTTParty.get(url,

1
app/models/dining_queue.rb
View File

@@ -1,3 +1,2 @@
class DiningQueue < ApplicationRecord class DiningQueue < ApplicationRecord
end end

4
app/models/lookup.rb
View File

@@ -17,6 +17,10 @@ class Lookup < ApplicationRecord
"Gateway Communication Type" => "gateway_communication_type"} "Gateway Communication Type" => "gateway_communication_type"}
end end
# def self.get_by_type( lookup_type)
# Lookup.select("value, name").where("lookup_type = ?", lookup_type ).order("name asc").map { |r| [r.name, r.value] }
# end
def self.collection_of(type) def self.collection_of(type)
Lookup.select("name, value").where("lookup_type" => type ).map { |l| [l.name, l.value] } Lookup.select("name, value").where("lookup_type" => type ).map { |l| [l.name, l.value] }

10
app/models/order.rb
View File

@@ -222,7 +222,8 @@ class Order < ApplicationRecord
#Origami: Cashier : to view booking order Table #Origami: Cashier : to view booking order Table
def self.get_booking_order_table def self.get_booking_order_table
booking_orders = Booking.select("sales.receipt_no,orders.status as order_status,orders.customer_id as customer_id, booking_orders = Booking.select("sales.receipt_no,orders.status as order_status,
orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id,
bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
.joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
.joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
@@ -235,7 +236,9 @@ class Order < ApplicationRecord
#Origami: Cashier : to view order type Room #Origami: Cashier : to view order type Room
def self.get_booking_order_rooms def self.get_booking_order_rooms
booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status,bookings.booking_id,orders.customer_id as customer_id, booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status,
orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id,
bookings.booking_id,orders.customer_id as customer_id,
sales.sale_id as sale_id,dining_facilities.name as room_name") sales.sale_id as sale_id,dining_facilities.name as room_name")
.joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id")
.joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
@@ -264,7 +267,8 @@ class Order < ApplicationRecord
from = Time.now.beginning_of_day.utc from = Time.now.beginning_of_day.utc
to = Time.now.end_of_day.utc to = Time.now.end_of_day.utc
orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status,
orders.customer_id as customer_id,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id
,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name")
.joins("left join booking_orders on booking_orders.order_id = orders.order_id .joins("left join booking_orders on booking_orders.order_id = orders.order_id
left join bookings on bookings.booking_id = booking_orders.order_id left join bookings on bookings.booking_id = booking_orders.order_id
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id

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

@@ -71,7 +71,6 @@
<%= 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>
<input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
<%= 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 " %>
@@ -94,17 +93,20 @@
<div class="form-group"> <div class="form-group">
<label>Date Of Birth</label> <label>Date Of Birth</label>
<%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%> <%= f.text_field :date_of_birth,:class => "form-control datepicker date_of_birth "%>
</div> </div>
<div class="form-group">
<select class="selectpicker form-control col-md-12" name="member_group_id">
<option>Select Member 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.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' %>

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

@@ -96,6 +96,16 @@
<label>Date Of Birth</label> <label>Date Of Birth</label>
<%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%> <%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%>
</div> </div>
<div class="form-group">
<select class="selectpicker form-control col-md-12" name="member_group_id">
<option>Select Member Group</option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
<option value="<%= member.value %>">
<%= member.name %></option>
<%end %>
</select>
</div>
@@ -194,7 +204,7 @@
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) {

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

@@ -25,19 +25,23 @@
@booking_orders.each do |bko| @booking_orders.each do |bko|
# Assigned Id for new Order? Sale? # Assigned Id for new Order? Sale?
unique_id="" unique_id=""
customer_id=""
# For CSS- Class for Order? Sale? # For CSS- Class for Order? Sale?
sale_status="" sale_status=""
if bko.order_status == 'new' if bko.order_status == 'new'
unique_id=bko.booking_id unique_id=bko.booking_id
customer_id=bko.order_customer_id
else else
unique_id=bko.sale_id unique_id=bko.sale_id
customer_id=bko.sale_customer_id
sale_status="sold" sale_status="sold"
end end
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
<p class="hidden orders-id"><%= unique_id %></p> <p class="hidden orders-id"><%= unique_id %></p>
<p class="hidden customer-id"><%= bko.customer_id %></p> <p class="hidden customer-id"><%= customer_id %></p>
<p class="hidden order-cid"><%= bko.order_id %></p>
<h4 class="card-title orders-table"><%= bko.table_name %></h4> <h4 class="card-title orders-table"><%= bko.table_name %></h4>
<p class="card-text"> <p class="card-text">
@@ -72,15 +76,18 @@
sale_status="" sale_status=""
if rmo.order_status == 'new' if rmo.order_status == 'new'
unique_id=rmo.booking_id unique_id=rmo.booking_id
customer_id=rmo.order_customer_id
else else
unique_id=rmo.sale_id unique_id=rmo.sale_id
customer_id=rmo.sale_customer_id
sale_status="sold" sale_status="sold"
end end
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
<p class="hidden orders-id"><%= unique_id %></p> <p class="hidden orders-id"><%= unique_id %></p>
<p class="hidden customer-id"><%= rmo.customer_id %></p> <p class="hidden customer-id"><%= customer_id %></p>
<p class="hidden order-cid"><%= rmo.order_id %></p>
<h4 class="card-title orders-table"><%= rmo.room_name %></h4> <h4 class="card-title orders-table"><%= rmo.room_name %></h4>
<p class="card-text"> <p class="card-text">
Receipt No : Receipt No :
@@ -114,15 +121,18 @@
sale_status="" sale_status=""
if odr.order_status == 'new' if odr.order_status == 'new'
unique_id=odr.booking_id unique_id=odr.booking_id
customer_id = odr.order_customer_id
else else
unique_id=odr.sale_id unique_id=odr.sale_id
customer_id = odr.sale_customer_id
sale_status="sold" sale_status="sold"
end end
%> %>
<div class="card orders <%= sale_status %>"> <div class="card orders <%= sale_status %>">
<div class="card-block"> <div class="card-block">
<p class="hidden orders-id"><%= unique_id %></p> <p class="hidden orders-id"><%= unique_id %></p>
<p class="hidden customer-id"><%= odr.customer_id %></p> <p class="hidden customer-id"><%= customer_id %></p>
<p class="hidden order-cid"><%= odr.order_id %></p>
<h4 class="card-title orders-table"><%= odr.table_name %></h4> <h4 class="card-title orders-table"><%= odr.table_name %></h4>
<p class="card-text"> <p class="card-text">
Receipt No : Receipt No :

4
db/migrate/20170608105644_create_crm_dining_queues.rb → db/migrate/20170612031153_create_dining_queues.rb
View File

@@ -1,6 +1,6 @@
class CreateCrmDiningQueues < ActiveRecord::Migration[5.1] class CreateDiningQueues < ActiveRecord::Migration[5.1]
def change def change
create_table :crm_dining_queues do |t| create_table :dining_queues do |t|
t.string :name t.string :name
t.string :contact_no t.string :contact_no
t.string :queue_no t.string :queue_no

5
spec/models/dining_queue_spec.rb Normal file
View File

@@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe DiningQueue, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end